camera-app

Merge lp:~canonical-platform-qa/camera-app/lp1366825_fix_zoom into lp:camera-app

  1. lp1366825_fix_zoom
  2. Merge into trunk
Proposed by Omer Akram
Status: Merged
Approved by: Florian Boucault
Approved revision: 390
Merged at revision: 411
Proposed branch: lp:~canonical-platform-qa/camera-app/lp1366825_fix_zoom
Merge into: lp:camera-app
Diff against target: 30 lines (+3/-4)
2 files modified
tests/autopilot/camera_app/tests/test_capture.py (+1/-2)
tests/autopilot/camera_app/tests/test_zoom.py (+2/-2)
To merge this branch: bzr merge lp:~canonical-platform-qa/camera-app/lp1366825_fix_zoom
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Florian Boucault (community) Approve
Review via email: mp+233725@code.launchpad.net

Commit message

autopilot: fix camera zoom bar not showing in test due to small initial pinch

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:385
http://jenkins.qa.ubuntu.com/job/camera-app-ci/286/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/102
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/368
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3408
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/507
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/575
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12878
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2811
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3710
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3710/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:387
http://jenkins.qa.ubuntu.com/job/camera-app-ci/288/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/104
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/104/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/104
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3438
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/520
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/595
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2841
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3743
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3743/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:387
http://jenkins.qa.ubuntu.com/job/camera-app-ci/289/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/105
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/383
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3439
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/597
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12963
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3744
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3744/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:388
http://jenkins.qa.ubuntu.com/job/camera-app-ci/290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/106
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/106
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/389/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3507
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/528/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/615
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3812
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3812/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:388
http://jenkins.qa.ubuntu.com/job/camera-app-ci/291/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/107
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3530
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/631
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2925
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3836
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3836/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Omer Akram (om26er) wrote :

There seems to be a bug in the icons model, the settingsProperty for torch icon is sometimes given to the location icon, so that results in the test clicking on the wrong icon, hence causing test failure. https://bugs.launchpad.net/bugs/1369573

Revision history for this message
Florian Boucault (fboucault) wrote :

Looks great now. Tests seem to pass. Testing a bit more before final approve.

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

FAILED: Continuous integration, rev:390
http://jenkins.qa.ubuntu.com/job/camera-app-ci/299/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/115
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/115
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/482
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4061
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/625
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/802
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14599
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4390
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4390/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/299/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/camera_app/tests/test_capture.py'
2--- tests/autopilot/camera_app/tests/test_capture.py 2014-07-03 10:28:23 +0000
3+++ tests/autopilot/camera_app/tests/test_capture.py 2014-10-13 15:23:30 +0000
4@@ -32,10 +32,9 @@
5 super(TestCapture, self).tearDown()
6
7 """Test taking a picture"""
8- @unittest.skipIf(model() == 'Galaxy Nexus', 'Unusable with Mir on maguro')
9 def test_take_picture(self):
10 exposure_button = self.main_window.get_exposure_button()
11- pictures_dir = os.path.expanduser("~/Pictures/camera")
12+ pictures_dir = os.path.expanduser("~/Pictures/com.ubuntu.camera")
13
14 # Remove all pictures from pictures_dir that match our pattern
15 files = [
16
17=== modified file 'tests/autopilot/camera_app/tests/test_zoom.py'
18--- tests/autopilot/camera_app/tests/test_zoom.py 2014-06-30 07:57:09 +0000
19+++ tests/autopilot/camera_app/tests/test_zoom.py 2014-10-13 15:23:30 +0000
20@@ -33,8 +33,8 @@
21 viewfinder = self.main_window.get_viewfinder_geometry()
22 viewfinder_center = self.get_center(viewfinder)
23
24- pinch(viewfinder_center, (0, 0), (10, 0))
25- pinch(viewfinder_center, (10, 0), (0, 0))
26+ pinch(viewfinder_center, (0, 0), (15, 0))
27+ pinch(viewfinder_center, (15, 0), (0, 0))
28
29 """Tests the zoom slider to zoom in"""
30 def test_slider_zoom_in(self):

Subscribers

People subscribed via source and target branches