Merge lp:~mzanetti/unity/phablet-fix-ap-on-device into lp:unity/phablet

[Michael Zanetti]

fix autopilot tests on the phone.

[Omer Akram (om26er)]

Tested those changes already, approved

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:699
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1060/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1050
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/935
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/935/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/939
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1706

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1060/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

"make autopilot" doesn't work with this.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> "make autopilot" doesn't work with this.

Should be fixed now.

[Michał Sawicz (saviq)]

Let's see what CI has to say.

review: Approve

[Michał Sawicz (saviq)]

This will conflict with lp:~dandrader/unity/phablet_autopilotTouchOnly - so let's merge it here.

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'tests/autopilot/qml_phone_shell/tests/__init__.py'
--- tests/autopilot/qml_phone_shell/tests/__init__.py	2013-05-29 11:48:56 +0000
+++ tests/autopilot/qml_phone_shell/tests/__init__.py	2013-05-29 15:05:30 +0000
@@ -26,7 +26,7 @@
     def setUp(self, geometry, grid_size):
         super(ShellTestCase, self).setUp()
         # Lets assume we are installed system wide if this file is somewhere in /usr
-        if grid_size != 0:
+        if grid_size != "0":
             os.environ['GRID_UNIT_PX'] = grid_size
             self.grid_size = int(grid_size)
         else:
@@ -41,20 +41,20 @@
         os.environ['QML2_IMPORT_PATH'] = "../../builddir/tests/mocks:../../builddir/plugins"
         if geometry != "0x0":
             self.app = self.launch_test_application(
-                "../../builddir/qml-phone-shell", "-geometry", geometry, "-frameless")
+                "../../builddir/qml-phone-shell", "-geometry", geometry, "-frameless", app_type='qt')
         else:
             self.app = self.launch_test_application(
-                "../../builddir/qml-phone-shell", "-fullscreen")
+                "../../builddir/qml-phone-shell", "-fullscreen", app_type='qt')
 
     def launch_test_installed(self, geometry):
         os.environ['LD_LIBRARY_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks/LightDM/full"
         os.environ['QML2_IMPORT_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks:/usr/share/qml-phone-shell/plugins"
         if model() == 'Desktop' and geometry != "0x0":
             self.app = self.launch_test_application(
-               "qml-phone-shell", "-geometry", geometry, "-frameless")
+               "qml-phone-shell", "-geometry", geometry, "-frameless", app_type='qt')
         else:
             self.app = self.launch_test_application(
-               "qml-phone-shell", "-fullscreen")
+               "qml-phone-shell", "-fullscreen", app_type='qt')
 
     def skipWrapper(*args, **kwargs):
         pass