Merge lp:~om26er/ubuntu-ui-toolkit/autopilot_device into lp:ubuntu-ui-toolkit

[Omer Akram]

first step for autopilot tests to run on touch devices

first step for autopilot tests to run on touch devices

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:701
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/538/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/395
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/395/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2456
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2080

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/538/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

looks good

review: Approve

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2013-08-01 07:39:32 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2013-08-21 13:31:25 +0000
@@ -76,7 +76,8 @@
                 "/usr/lib/" + arch + "/qt5/bin/qmlscene",
                 "-I", get_module_include_path(),
                 qml_path,
-                emulator_base=emulators.UbuntuUIToolkitEmulatorBase)
+                emulator_base=emulators.UbuntuUIToolkitEmulatorBase,
+                app_type='qt')
 
         if (hasattr(self, 'test_qml_file') and
                 isinstance(self.test_qml_file, basestring)):
@@ -85,7 +86,8 @@
                 "/usr/lib/" + arch + "/qt5/bin/qmlscene",
                 "-I", get_module_include_path(),
                 qml_path,
-                emulator_base=emulators.UbuntuUIToolkitEmulatorBase)
+                emulator_base=emulators.UbuntuUIToolkitEmulatorBase,
+                app_type='qt')
 
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))