Merge lp:~om26er/ubuntu-calculator-app/pointing_device into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Omer Akram]

create input device from the uitoolkit emulators

toolkit emulators have a function that creates the input device, just inherit it over instead of repeating the code.

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

FAILED: Continuous integration, rev:170
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/118/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/569/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/117/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/117/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/117/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/117/console

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Code looks good.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calculator-app-autolanding/56/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/566/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-autolanding/56/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-autolanding/56/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-autolanding/12/console

review: Needs Fixing (continuous-integration)

[lp:~om26er/ubuntu-calculator-app/pointing_device]

171. By Omer Akram on 2014-01-06

merge trunk

172. By Omer Akram on 2014-01-06

fix pyflakes warnings

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

PASSED: Continuous integration, rev:172
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/142/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/577
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/141
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/141
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/13

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2013-11-05 00:41:03 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2014-01-06 12:15:47 +0000
@@ -11,8 +11,6 @@
 import shutil
 import logging
 
-from autopilot.input import Mouse, Touch, Pointer
-from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 from ubuntuuitoolkit import (
     base,
@@ -30,11 +28,6 @@
     app.
 
     """
-    if model() == 'Desktop':
-        scenarios = [('with mouse', dict(input_device_class=Mouse))]
-    else:
-        scenarios = [('with touch', dict(input_device_class=Touch))]
-
     local_location = "../../ubuntu-calculator-app.qml"
     installed_location = "/usr/share/ubuntu-calculator-app/" \
                          "ubuntu-calculator-app.qml"
@@ -44,7 +37,7 @@
     backup_dir = sqlite_dir + ".backup"
 
     def setUp(self):
-        self.pointing_device = Pointer(self.input_device_class.create())
+        self.pointing_device = toolkit_emulators.get_pointing_device()
         super(CalculatorTestCase, self).setUp()
         self.temp_move_sqlite_db()
         self.addCleanup(self.restore_sqlite_db)