Merge lp://qastaging/~canonical-platform-qa/camera-app/fix-1514408-swipe-to-gallery into lp://qastaging/camera-app
Proposed by
Richard Huddie
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Florian Boucault | ||||
Approved revision: | 595 | ||||
Merged at revision: | 600 | ||||
Proposed branch: | lp://qastaging/~canonical-platform-qa/camera-app/fix-1514408-swipe-to-gallery | ||||
Merge into: | lp://qastaging/camera-app | ||||
Diff against target: |
72 lines (+15/-8) 3 files modified
camera-app.qml (+1/-0) tests/autopilot/camera_app/emulators/main_window.py (+11/-5) tests/autopilot/camera_app/tests/test_options.py (+3/-3) |
||||
To merge this branch: | bzr merge lp://qastaging/~canonical-platform-qa/camera-app/fix-1514408-swipe-to-gallery | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+276993@code.qastaging.launchpad.net |
Commit message
Fix for https:/
Use the x, y, width and height properties of main_window, rather than globalRect property which does not exist.
To post a comment you must log in.
FAILED: Continuous integration, rev:593 jenkins. qa.ubuntu. com/job/ camera- app-ci/ 449/ jenkins. qa.ubuntu. com/job/ camera- app-vivid- amd64-ci/ 145/console jenkins. qa.ubuntu. com/job/ camera- app-vivid- armhf-ci/ 145/console jenkins. qa.ubuntu. com/job/ camera- app-vivid- i386-ci/ 145/console jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/299 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- mako/956 jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 788 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 25037
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/camera- app-ci/ 449/rebuild
http://