Merge lp:~nskaggs/ubuntu-rssreader-app/feed-ap-fixes into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

Proposed by Nicholas Skaggs
Status: Merged
Approved by: Joey Chan
Approved revision: 50
Merged at revision: 50
Proposed branch: lp:~nskaggs/ubuntu-rssreader-app/feed-ap-fixes
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 53 lines (+0/-21)
1 file modified
tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py (+0/-21)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-rssreader-app/feed-ap-fixes
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+183207@code.launchpad.net

Commit message

remove unneeded asserts about shorts page

Description of the change

Fixes failing add and remove feed test in the virtual enviroment

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
2--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-08-15 16:11:02 +0000
3+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-08-30 15:05:49 +0000
4@@ -28,11 +28,6 @@
5
6 def _add_feed_and_topic(self):
7 """test add feed and topic"""
8-
9- #verify we are on the first page)
10- shortsPage = lambda: self.main_view.switch_to_tab_by_index(0).visible
11- self.assertThat(shortsPage, Eventually(Equals(True)))
12-
13 #open toolbar
14 toolbar = self.main_view.open_toolbar()
15
16@@ -80,15 +75,7 @@
17 #just for timing purposes
18 self.assertThat(canonicalTopic.text, Eventually(Equals("CanonicalTopic")))
19
20- #verify we are on the first page
21- shortsPage = self.main_view.switch_to_tab_by_index(0).visible
22- self.assertThat(shortsPage, Eventually(Equals(True)))
23-
24 def _remove_feed(self):
25- #verify we are on the first page
26- shortsPage = self.main_view.switch_to_tab_by_index(0).visible
27- self.assertThat(shortsPage, Eventually(Equals(True)))
28-
29 #open toolbar
30 toolbar = self.main_view.open_toolbar()
31
32@@ -133,10 +120,6 @@
33 #this been quasi converted to the sdk, but does not work as-is
34 #see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1211631
35
36- #verify we are on the first page
37- shortsPage = self.main_view.switch_to_tab_by_index(0).visible
38- self.assertThat(shortsPage, Eventually(Equals(True)))
39-
40 #open toolbar
41 toolbar = self.main_view.open_toolbar()
42
43@@ -223,10 +206,6 @@
44 def test_view_feeds(self):
45 """test view feeds"""
46
47- #verify we are on the first page
48- shortsPage = lambda: self.main_view.switch_to_tab_by_index(0).visible
49- self.assertThat(shortsPage, Eventually(Equals(True)))
50-
51 #-----> view all news:
52 #open toolbar
53 toolbar = self.main_view.open_toolbar()

Subscribers

People subscribed via source and target branches