camera-app

Merge lp://qastaging/~canonical-platform-qa/camera-app/fix-1514408-swipe-to-gallery into lp://qastaging/camera-app

  1. fix-1514408-swipe-to-gallery
  2. Merge into trunk
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
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://bugs.launchpad.net/camera-app/+bug/1514408

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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:593
http://jenkins.qa.ubuntu.com/job/camera-app-ci/449/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/145/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/299
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/956
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/788
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25037

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/449/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

Additional tests are failing for similar reasons. I will be providing more fixes ASAP.

lp://qastaging/~canonical-platform-qa/camera-app/fix-1514408-swipe-to-gallery updated
595. By Richard Huddie

Merge additional fixes from lp:~fboucault/camera-app/fix-1514408-swipe-to-gallery

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:594
http://jenkins.qa.ubuntu.com/job/camera-app-ci/467/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/163
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/163
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/321
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/823
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25332

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/467/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches