Ubuntu Shorts App

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

  1. feed-ap-fixes
  2. Merge into 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 :

FAILED: Continuous integration, rev:47
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/9/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/107/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/9

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/9/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:50
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/10/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/108/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/10

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/10/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:50
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/11/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/111
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/11
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/11

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/11/rebuild

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
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-08-15 16:11:02 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-08-30 15:05:49 +0000
@@ -28,11 +28,6 @@
2828
29 def _add_feed_and_topic(self):29 def _add_feed_and_topic(self):
30 """test add feed and topic"""30 """test add feed and topic"""
31
32 #verify we are on the first page)
33 shortsPage = lambda: self.main_view.switch_to_tab_by_index(0).visible
34 self.assertThat(shortsPage, Eventually(Equals(True)))
35
36 #open toolbar31 #open toolbar
37 toolbar = self.main_view.open_toolbar()32 toolbar = self.main_view.open_toolbar()
3833
@@ -80,15 +75,7 @@
80 #just for timing purposes75 #just for timing purposes
81 self.assertThat(canonicalTopic.text, Eventually(Equals("CanonicalTopic")))76 self.assertThat(canonicalTopic.text, Eventually(Equals("CanonicalTopic")))
8277
83 #verify we are on the first page
84 shortsPage = self.main_view.switch_to_tab_by_index(0).visible
85 self.assertThat(shortsPage, Eventually(Equals(True)))
86
87 def _remove_feed(self):78 def _remove_feed(self):
88 #verify we are on the first page
89 shortsPage = self.main_view.switch_to_tab_by_index(0).visible
90 self.assertThat(shortsPage, Eventually(Equals(True)))
91
92 #open toolbar79 #open toolbar
93 toolbar = self.main_view.open_toolbar()80 toolbar = self.main_view.open_toolbar()
9481
@@ -133,10 +120,6 @@
133 #this been quasi converted to the sdk, but does not work as-is120 #this been quasi converted to the sdk, but does not work as-is
134 #see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1211631121 #see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1211631
135122
136 #verify we are on the first page
137 shortsPage = self.main_view.switch_to_tab_by_index(0).visible
138 self.assertThat(shortsPage, Eventually(Equals(True)))
139
140 #open toolbar123 #open toolbar
141 toolbar = self.main_view.open_toolbar()124 toolbar = self.main_view.open_toolbar()
142125
@@ -223,10 +206,6 @@
223 def test_view_feeds(self):206 def test_view_feeds(self):
224 """test view feeds"""207 """test view feeds"""
225208
226 #verify we are on the first page
227 shortsPage = lambda: self.main_view.switch_to_tab_by_index(0).visible
228 self.assertThat(shortsPage, Eventually(Equals(True)))
229
230 #-----> view all news:209 #-----> view all news:
231 #open toolbar210 #open toolbar
232 toolbar = self.main_view.open_toolbar()211 toolbar = self.main_view.open_toolbar()

Subscribers

People subscribed via source and target branches