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

Proposed by Michael Zanetti
Status: Merged
Approved by: Michał Sawicz
Approved revision: no longer in the source branch.
Merged at revision: 709
Proposed branch: lp:~mzanetti/unity/phablet-fix-ap-on-device
Merge into: lp:unity/phablet
Diff against target: 37 lines (+5/-5)
1 file modified
tests/autopilot/qml_phone_shell/tests/__init__.py (+5/-5)
To merge this branch: bzr merge lp:~mzanetti/unity/phablet-fix-ap-on-device
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Omer Akram (community) Approve
Review via email: mp+166084@code.launchpad.net

Commit message

fix autopilot tests on the phone.

To post a comment you must log in.
Revision history for this message
Omer Akram (om26er) wrote :

Tested those changes already, approved

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

"make autopilot" doesn't work with this.

review: Needs Fixing
Revision history for this message
Michael Zanetti (mzanetti) wrote :

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

Should be fixed now.

Revision history for this message
Michał Sawicz (saviq) wrote :

Let's see what CI has to say.

review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

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

Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
26 def setUp(self, geometry, grid_size):26 def setUp(self, geometry, grid_size):
27 super(ShellTestCase, self).setUp()27 super(ShellTestCase, self).setUp()
28 # Lets assume we are installed system wide if this file is somewhere in /usr28 # Lets assume we are installed system wide if this file is somewhere in /usr
29 if grid_size != 0:29 if grid_size != "0":
30 os.environ['GRID_UNIT_PX'] = grid_size30 os.environ['GRID_UNIT_PX'] = grid_size
31 self.grid_size = int(grid_size)31 self.grid_size = int(grid_size)
32 else:32 else:
@@ -41,20 +41,20 @@
41 os.environ['QML2_IMPORT_PATH'] = "../../builddir/tests/mocks:../../builddir/plugins"41 os.environ['QML2_IMPORT_PATH'] = "../../builddir/tests/mocks:../../builddir/plugins"
42 if geometry != "0x0":42 if geometry != "0x0":
43 self.app = self.launch_test_application(43 self.app = self.launch_test_application(
44 "../../builddir/qml-phone-shell", "-geometry", geometry, "-frameless")44 "../../builddir/qml-phone-shell", "-geometry", geometry, "-frameless", app_type='qt')
45 else:45 else:
46 self.app = self.launch_test_application(46 self.app = self.launch_test_application(
47 "../../builddir/qml-phone-shell", "-fullscreen")47 "../../builddir/qml-phone-shell", "-fullscreen", app_type='qt')
4848
49 def launch_test_installed(self, geometry):49 def launch_test_installed(self, geometry):
50 os.environ['LD_LIBRARY_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks/LightDM/full"50 os.environ['LD_LIBRARY_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks/LightDM/full"
51 os.environ['QML2_IMPORT_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks:/usr/share/qml-phone-shell/plugins"51 os.environ['QML2_IMPORT_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks:/usr/share/qml-phone-shell/plugins"
52 if model() == 'Desktop' and geometry != "0x0":52 if model() == 'Desktop' and geometry != "0x0":
53 self.app = self.launch_test_application(53 self.app = self.launch_test_application(
54 "qml-phone-shell", "-geometry", geometry, "-frameless")54 "qml-phone-shell", "-geometry", geometry, "-frameless", app_type='qt')
55 else:55 else:
56 self.app = self.launch_test_application(56 self.app = self.launch_test_application(
57 "qml-phone-shell", "-fullscreen")57 "qml-phone-shell", "-fullscreen", app_type='qt')
5858
59 def skipWrapper(*args, **kwargs):59 def skipWrapper(*args, **kwargs):
60 pass60 pass

Subscribers

People subscribed via source and target branches