Merge lp:~martin-borho/ubuntu-weather-app/ap-loading-timeouts into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

added some increased timeouts to loading checks in AP tests

added some increased timeouts to loading checks in AP tests

[Nicholas Skaggs (nskaggs)]

I seem to remember us having these longtimeouts at one point.. interesting they make a comeback

[Nicholas Skaggs (nskaggs)]

As far as merging in looking at the errors further I don't believe these timeouts will have any affect on the issues at hand.

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

FAILED: Continuous integration, rev:213
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/154/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/47
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/152
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/152
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/66

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-02-15 14:31:10 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-03-04 20:56:04 +0000
@@ -250,7 +250,7 @@
 
         # back to locations, only one is left
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         self.assertThat(lambda: tabsSumStart-1, Eventually(Equals(len(tabObjects))))
 
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2014-02-26 17:08:11 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2014-03-04 20:56:04 +0000
@@ -164,7 +164,7 @@
 
         # wait for reload and check the imperial values
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         self._check_units('imperial')
 
         # switch back to metric values again
@@ -192,7 +192,7 @@
 
         # wait for reload and check the metric values again
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         self._check_units('metric')
 
     def test_switch_scale_cancel(self):
@@ -262,7 +262,7 @@
 
         # wait for reload and check the mph values
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         self._check_wind_units('mph')
 
         # switch back to kmh values again
@@ -290,7 +290,7 @@
 
         # wait for reload and check the metric values again
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         self._check_wind_units('kmh')
 
     @skip("data not available")
@@ -319,7 +319,7 @@
 
         # wait for reload and check the inch values
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         self._check_wind_units('in')
 
         # switch back to mm values again
@@ -349,7 +349,7 @@
 
         # wait for reload and check the metric values again
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         self._check_precipitation_units('mm')
 
     def test_switch_service(self):
@@ -383,7 +383,7 @@
 
         # wait for reload and check the used service 
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         self._check_service('openweathermap')
 
         # switch back to metric values again
@@ -415,5 +415,5 @@
 
         # wait for reload and check the metric values again
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         self._check_service('weatherchannel')