Merge lp:~nskaggs/ubuntu-calculator-app/1324476 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Nicholas Skaggs]

Fixed an AP test that didn't work on devices

Fixed an AP test that didn't work on devices
Also fix flake8 error from original MP :-)

[Nicholas Skaggs (nskaggs)]

Fixes the swipe issue on my device.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:276
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/214/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2864/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/85/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/9/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/214/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-autolanding/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/57
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-trusty-amd64-autolanding/5/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-utopic-amd64-autolanding/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/79
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7948

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-autolanding/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/58
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-trusty-amd64-autolanding/6/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-utopic-amd64-autolanding/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/80
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7952

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-autolanding/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/59
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-trusty-amd64-autolanding/7/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-utopic-amd64-autolanding/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/81
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7957

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-autolanding/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/60
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-trusty-amd64-autolanding/8/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-calculator-app-utopic-amd64-autolanding/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/82
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7958

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~nskaggs/ubuntu-calculator-app/1324476/+merge/221572/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_calculator_app/emulators.py'
--- tests/autopilot/ubuntu_calculator_app/emulators.py	2014-05-22 15:02:19 +0000
+++ tests/autopilot/ubuntu_calculator_app/emulators.py	2014-05-30 17:40:33 +0000
@@ -268,10 +268,7 @@
 
     def confirm_delete(self):
         """Confirm the deletion of the calculation."""
-        """Move on the icon to click"""
-        x, y, w, h = self.globalRect
-        tx = x + (w - w / 3)
-        ty = y + (h / 2)
-        self.pointing_device.move(tx, ty)
+        delete_item = self.select_single(
+            'QQuickItem', objectName='confirmRemovalDialog')
         """Click the icon"""
-        self.pointing_device.click()
+        self.pointing_device.click_object(delete_item)