camera-app

Merge lp:~om26er/camera-app/ports_autopilot_tests_to_py3 into lp:camera-app

  1. ports_autopilot_tests_to_py3
  2. Merge into trunk
Proposed by Omer Akram
Status: Merged
Approved by: Ugo Riboni
Approved revision: 227
Merged at revision: 227
Proposed branch: lp:~om26er/camera-app/ports_autopilot_tests_to_py3
Merge into: lp:camera-app
Diff against target: 59 lines (+1/-9)
4 files modified
tests/autopilot/camera_app/tests/test_capture.py (+0/-2)
tests/autopilot/camera_app/tests/test_flash.py (+0/-2)
tests/autopilot/camera_app/tests/test_focus.py (+1/-3)
tests/autopilot/camera_app/tests/test_zoom.py (+0/-2)
To merge this branch: bzr merge lp:~om26er/camera-app/ports_autopilot_tests_to_py3
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+195613@code.launchpad.net

Commit message

port autopilot tests to python 3

Description of the change

port autopilot tests to python 3

To post a comment you must log in.
lp:~om26er/camera-app/ports_autopilot_tests_to_py3 updated
227. By Omer Akram

better way to return int

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

PASSED: Continuous integration, rev:226
http://jenkins.qa.ubuntu.com/job/camera-app-ci/147/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-i386-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/767
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/712
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/779
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/779/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/767
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/767/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3393
    SUCCESS: http://s-jenkins:8080/job/touch-flash-device/1483

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

review: Approve (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 2013-10-11 00:36:09 +0000
3+++ tests/autopilot/camera_app/tests/test_capture.py 2013-11-18 14:19:30 +0000
4@@ -7,8 +7,6 @@
5
6 """Tests for the Camera App"""
7
8-from __future__ import absolute_import
9-
10 from autopilot.matchers import Eventually
11 from autopilot.platform import model
12 from testtools.matchers import Equals, NotEquals, GreaterThan
13
14=== modified file 'tests/autopilot/camera_app/tests/test_flash.py'
15--- tests/autopilot/camera_app/tests/test_flash.py 2013-10-07 10:44:08 +0000
16+++ tests/autopilot/camera_app/tests/test_flash.py 2013-11-18 14:19:30 +0000
17@@ -7,8 +7,6 @@
18
19 """Tests for the Camera App flash"""
20
21-from __future__ import absolute_import
22-
23 from testtools.matchers import Equals, NotEquals
24 from autopilot.matchers import Eventually
25
26
27=== modified file 'tests/autopilot/camera_app/tests/test_focus.py'
28--- tests/autopilot/camera_app/tests/test_focus.py 2013-11-06 13:49:10 +0000
29+++ tests/autopilot/camera_app/tests/test_focus.py 2013-11-18 14:19:30 +0000
30@@ -7,8 +7,6 @@
31
32 """Tests for the Camera App"""
33
34-from __future__ import absolute_import
35-
36 from autopilot.matchers import Eventually
37 from autopilot.platform import model
38 from testtools.matchers import Equals, NotEquals, GreaterThan
39@@ -62,7 +60,7 @@
40 self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
41
42 # Click in the center of the viewfinder area
43- click_coords =[feed.globalRect[2] / 2 + feed.globalRect[0], feed.globalRect[3] / 2 + feed.globalRect[1]]
44+ click_coords =[feed.globalRect[2] // 2 + feed.globalRect[0], feed.globalRect[3] // 2 + feed.globalRect[1]]
45 self.pointing_device.move(click_coords[0], click_coords[1])
46 self.pointing_device.click()
47
48
49=== modified file 'tests/autopilot/camera_app/tests/test_zoom.py'
50--- tests/autopilot/camera_app/tests/test_zoom.py 2013-06-11 15:14:52 +0000
51+++ tests/autopilot/camera_app/tests/test_zoom.py 2013-11-18 14:19:30 +0000
52@@ -7,8 +7,6 @@
53
54 """Tests for the Camera App zoom"""
55
56-from __future__ import absolute_import
57-
58 from testtools.matchers import Equals, NotEquals, GreaterThan, LessThan
59 from autopilot.matchers import Eventually
60

Subscribers

People subscribed via source and target branches