Merge lp:~nskaggs/ubuntu-rssreader-app/fix-network-timeout-ap into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Nicholas Skaggs]

Fix for network activity issue while running tests

Fix for network activity issue while running tests

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

FAILED: Continuous integration, rev:214
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/209/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2173
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/209
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/209
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/96

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-rssreader-app/fix-network-timeout-ap]

215. By Nicholas Skaggs on 2014-04-18

change asserts for view mode to use eventually

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

PASSED: Continuous integration, rev:214
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/210/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2174
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/210
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/210
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/97

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:215
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/211/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2175
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/211
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/211
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/98

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/shorts_app/tests/test_rssreader.py'
--- tests/autopilot/shorts_app/tests/test_rssreader.py	2014-04-05 12:59:39 +0000
+++ tests/autopilot/shorts_app/tests/test_rssreader.py	2014-04-18 17:23:16 +0000
@@ -42,7 +42,7 @@
         try:
             self.assertThat(
                 self.main_view.get_network_activity,
-                Eventually(NotEquals(None), timeout=60))
+                Eventually(NotEquals(None), timeout=5))
             self.assertThat(
                 self.main_view.get_network_activity,
                 Eventually(Equals(None), timeout=60))
@@ -246,14 +246,14 @@
         shorts_tab = self.main_view.get_shorts_tab()
         self.ensure_grid_view_mode(shorts_tab)
         self.main_view.change_view_mode()
-        self.assertTrue(shorts_tab.isListMode)
+        self.assertThat(shorts_tab.isListMode, Eventually(Equals(True)))
 
     def test_switch_to_grid_view_mode(self):
         """ test switching to grid view  mode"""
         shorts_tab = self.main_view.get_shorts_tab()
         self.ensure_list_view_mode(shorts_tab)
         self.main_view.change_view_mode()
-        self.assertFalse(shorts_tab.isListMode)
+        self.assertThat(shorts_tab.isListMode, Eventually(Equals(False)))
 
     def ensure_grid_view_mode(self, current_tab):
          if current_tab.isListMode: