Merge lp:~vthompson/ubuntu-weather-app/fix-1452494 into lp:ubuntu-weather-app
Status: | Merged |
---|---|
Approved by: | Andrew Hayzen on 2015-08-17 |
Approved revision: | 95 |
Merged at revision: | 96 |
Proposed branch: | lp:~vthompson/ubuntu-weather-app/fix-1452494 |
Merge into: | lp:ubuntu-weather-app |
Prerequisite: | lp:~vthompson/ubuntu-weather-app/fix-1452499 |
Diff against target: |
90 lines (+39/-3) 4 files modified
app/ui/LocationsPage.qml (+5/-1) debian/changelog (+3/-0) tests/autopilot/ubuntu_weather_app/__init__.py (+12/-2) tests/autopilot/ubuntu_weather_app/tests/test_locations_page.py (+19/-0) |
To merge this branch: | bzr merge lp:~vthompson/ubuntu-weather-app/fix-1452494 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve on 2015-08-17 | |
Andrew Hayzen | 2015-08-08 | Approve on 2015-08-17 | |
Review via email:
|
Commit message
* Create autopilot test which changes the selected location
* When location detection is off, make sure the correct location can be selected
Description of the change
* Create autopilot test which changes the selected location
* When location detection is off, make sure the correct location can be selected
PASSED: Continuous integration, rev:90
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PASSED: Continuous integration, rev:92
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Andrew Hayzen (ahayzen) wrote : | # |
One inline comment to stop repetition of code, otherwise all passing and fixes the bug :-)
Victor Thompson (vthompson) wrote : | # |
I pushed a fix, but even trunk has 2 failing tests... probably due to OWM servers not working again? Please retest.
FAILED: Continuous integration, rev:93
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PASSED: Continuous integration, rev:94
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Andrew Hayzen (ahayzen) wrote : | # |
LGTM, one of the failing tests I found was due to bug 1485657 which I've created a patch for.
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
- 95. By Victor Thompson on 2015-08-17
-
Merge and resolve conflicts.
PASSED: Continuous integration, rev:95
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PASSED: Continuous integration, rev:88 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- ci/183/ 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- utopic- amd64-ci/ 153 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- vivid-amd64- ci/183
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- ci/183/ rebuild
http://