Ubuntu Shorts App

Merge lp:~carla-sella/ubuntu-rssreader-app/add-remove_feed into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. add-remove_feed
  2. Merge into trunk
Proposed by Carla Sella
Status: Merged
Approved by: Joey Chan
Approved revision: 84
Merged at revision: 87
Proposed branch: lp:~carla-sella/ubuntu-rssreader-app/add-remove_feed
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 44 lines (+8/-7)
1 file modified
tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py (+8/-7)
To merge this branch: bzr merge lp:~carla-sella/ubuntu-rssreader-app/add-remove_feed
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nicholas Skaggs (community) Needs Fixing
Review via email: mp+188713@code.launchpad.net

Commit message

Autopilot test for ubuntu-rssreader-app

Description of the change

Fixed test test_add_remove_feed_and_topic the final part "remove added topic" still has to be fixed.

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:84
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/65/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/602
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/65
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/65
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/65
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/65

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Carla can you modify this to include eventually, like so:

self.assertThat(self.main_view.get_topics_page, Eventually(NotEquals(None)))

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

Inserted Eventually as Nichoalas asked.

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-09-27 16:22:15 +0000
3+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py 2013-10-01 20:50:31 +0000
4@@ -33,11 +33,13 @@
5
6 #wait for any updates to finish before beginning tests
7 self.assertThat(self.main_view.get_network_activity, Eventually(Not(Is(None))))
8- self.assertThat(self.main_view.get_network_activity, Eventually(Is(None)))
9
10 def _add_feed_and_topic(self, feed, topicName):
11 """test add feed and topic"""
12 logger.debug("starting test add feed and topic")
13+
14+ self.assertThat(self.main_view.get_topics_page(), NotEquals(None))
15+
16 #open toolbar
17 logger.debug("opening toolbar")
18 toolbar = self.main_view.open_toolbar()
19@@ -262,20 +264,19 @@
20
21 #remove added feed
22 logger.debug("starting remove feed")
23- #12 sept 2013,
24- #this transition currently locks the device https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1221893
25- #self._remove_feed(feedName, topicName)
26+
27+ self._remove_feed(feedName, topicName)
28
29 #remove added topic
30- #12 Aug 2013, removing topic broken for now
31- #test commented until fixed, see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1211631
32- #self._remove_topic()
33+ #self._remove_topic(topicName)
34
35
36 @unittest.skip("Topic page broken, see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1206248")
37 def test_view_feeds(self):
38 """test view feeds"""
39
40+ self.assertThat(self.main_view.get_topics_page(), NotEquals(None))
41+
42 #-----> view all news:
43 #open toolbar
44 toolbar = self.main_view.open_toolbar()

Subscribers

People subscribed via source and target branches