Merge lp:~nskaggs/ubuntu-rssreader-app/timing-quick-fix into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Nicholas Skaggs]

Fix timing issue

Fix timing issue in _remove_feed for AP tests

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:180
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/182/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1461
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/182
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/182
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/69

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

review: Approve (continuous-integration)

Unmerged revisions

180. By Nicholas Skaggs on 2014-02-21

fix timing issue

=== modified file 'tests/autopilot/shorts_app/tests/test_rssreader.py'
--- tests/autopilot/shorts_app/tests/test_rssreader.py	2014-02-13 03:52:29 +0000
+++ tests/autopilot/shorts_app/tests/test_rssreader.py	2014-02-21 23:52:59 +0000
@@ -137,7 +137,7 @@
                         Equals(feedName))
         logger.debug("grabbing feed")
         feed = self.main_view.get_feedlist_feed(feedName)
-        feedLabel = feed.select_single('Label', text=feedName)
+        feedLabel = feed.wait_select_single('Label', text=feedName)
 
         self.assertThat(self.main_view.get_feed_management_page,
                         Eventually(NotEquals(None)))
@@ -153,9 +153,8 @@
 
         #verify we are on the Management page
         logger.debug("assert feedlistpage")
-        feedlistpage = lambda: self.main_view. \
-            get_feed_management_page().visible
-        self.assertThat(feedlistpage, Eventually(Equals(True)))
+        feedlistpage = self.main_view.get_feed_management_page()
+        self.assertThat(feedlistpage.visible, Eventually(Equals(True)))
 
         #check topic
         logger.debug("assert topic remains")