Ubuntu Weather App

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

  1. ap-loading-timeouts
  2. Merge into trunk
Proposed by Martin Borho
Status: Merged
Merged at revision: 216
Proposed branch: lp:~martin-borho/ubuntu-weather-app/ap-loading-timeouts
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 86 lines (+9/-9)
2 files modified
tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py (+1/-1)
tests/autopilot/ubuntu_weather_app/tests/test_settings.py (+8/-8)
To merge this branch: bzr merge lp:~martin-borho/ubuntu-weather-app/ap-loading-timeouts
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Ubuntu Weather Developers Pending
Review via email: mp+209333@code.launchpad.net

Commit message

added some increased timeouts to loading checks in AP tests

Description of the change

added some increased timeouts to loading checks in AP tests

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

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

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

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.

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

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
2--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py 2014-02-15 14:31:10 +0000
3+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py 2014-03-04 20:56:04 +0000
4@@ -250,7 +250,7 @@
5
6 # back to locations, only one is left
7 load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
8- self.assertThat(load_indicator.running, Eventually(Equals(False)))
9+ self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
10 tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
11 self.assertThat(lambda: tabsSumStart-1, Eventually(Equals(len(tabObjects))))
12
13
14=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
15--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py 2014-02-26 17:08:11 +0000
16+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py 2014-03-04 20:56:04 +0000
17@@ -164,7 +164,7 @@
18
19 # wait for reload and check the imperial values
20 load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
21- self.assertThat(load_indicator.running, Eventually(Equals(False)))
22+ self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
23 self._check_units('imperial')
24
25 # switch back to metric values again
26@@ -192,7 +192,7 @@
27
28 # wait for reload and check the metric values again
29 load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
30- self.assertThat(load_indicator.running, Eventually(Equals(False)))
31+ self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
32 self._check_units('metric')
33
34 def test_switch_scale_cancel(self):
35@@ -262,7 +262,7 @@
36
37 # wait for reload and check the mph values
38 load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
39- self.assertThat(load_indicator.running, Eventually(Equals(False)))
40+ self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
41 self._check_wind_units('mph')
42
43 # switch back to kmh values again
44@@ -290,7 +290,7 @@
45
46 # wait for reload and check the metric values again
47 load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
48- self.assertThat(load_indicator.running, Eventually(Equals(False)))
49+ self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
50 self._check_wind_units('kmh')
51
52 @skip("data not available")
53@@ -319,7 +319,7 @@
54
55 # wait for reload and check the inch values
56 load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
57- self.assertThat(load_indicator.running, Eventually(Equals(False)))
58+ self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
59 self._check_wind_units('in')
60
61 # switch back to mm values again
62@@ -349,7 +349,7 @@
63
64 # wait for reload and check the metric values again
65 load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
66- self.assertThat(load_indicator.running, Eventually(Equals(False)))
67+ self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
68 self._check_precipitation_units('mm')
69
70 def test_switch_service(self):
71@@ -383,7 +383,7 @@
72
73 # wait for reload and check the used service
74 load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
75- self.assertThat(load_indicator.running, Eventually(Equals(False)))
76+ self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
77 self._check_service('openweathermap')
78
79 # switch back to metric values again
80@@ -415,5 +415,5 @@
81
82 # wait for reload and check the metric values again
83 load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
84- self.assertThat(load_indicator.running, Eventually(Equals(False)))
85+ self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
86 self._check_service('weatherchannel')

Subscribers

People subscribed via source and target branches