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

[Leo Arias]

Use pointing_device from self.app instead of the testCase passed in

A couple of the functions in the MainWindow class oddly assume that the AutopilotTestCase has a pointing_device member. This is not necessarily the case but the app proxy is sure to have one, and the MainWindow class already stores the app proxy in self.app so we should really use that instead of the testCase to provide the pointing device

[Leo Arias (elopio)]

lgtm.
A future improvement is to make the MainWindow a custom proxy object, then there will be no need to save the app proxy as an instance var.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/camera-app-ci/391/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/155/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/634/console
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/789/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/344
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18164
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/744/console

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

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

The mako job failed due to a device having failed. The -ci job as been restarted.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/camera-app-ci/392/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/88/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/157
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/637/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/350
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18205
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/749/console

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

review: Needs Fixing (continuous-integration)

[Vincent Ladeuil (vila)]

Clear enough as long as the CI tests pass, approving.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:515
http://jenkins.qa.ubuntu.com/job/camera-app-ci/423/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/119
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/224
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/875
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/566
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20521

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/camera_app/emulators/main_window.py'
--- tests/autopilot/camera_app/emulators/main_window.py	2015-05-15 07:40:59 +0000
+++ tests/autopilot/camera_app/emulators/main_window.py	2015-05-15 07:40:59 +0000
@@ -142,7 +142,7 @@
         tx = x + (w // 2)
         ty = y + (h // 2)
 
-        testCase.pointing_device.drag(tx, ty, x, ty, rate=1)
+        self.app.pointing_device.drag(tx, ty, x, ty, rate=1)
         viewfinder = self.get_viewfinder()
         testCase.assertThat(viewfinder.inView, Eventually(Equals(False)))
 
@@ -153,7 +153,7 @@
         tx = x + (w // 2)
         ty = y + (h // 2)
 
-        testCase.pointing_device.drag(
+        self.app.pointing_device.drag(
             tx, ty, (tx + main_view.width // 2), ty, rate=1)
         viewfinder = self.get_viewfinder()
         testCase.assertThat(viewfinder.inView, Eventually(Equals(True)))