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

Proposed by Omer Akram
Status: Merged
Approved by: Günter Schwann
Approved revision: 701
Merged at revision: 702
Proposed branch: lp:~om26er/ubuntu-ui-toolkit/autopilot_device
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 23 lines (+4/-2)
1 file modified
tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+4/-2)
To merge this branch: bzr merge lp:~om26er/ubuntu-ui-toolkit/autopilot_device
Reviewer Review Type Date Requested Status
Günter Schwann (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+181302@code.launchpad.net

Commit message

first step for autopilot tests to run on touch devices

Description of the change

first step for autopilot tests to run on touch devices

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Günter Schwann (schwann) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
76 "/usr/lib/" + arch + "/qt5/bin/qmlscene",76 "/usr/lib/" + arch + "/qt5/bin/qmlscene",
77 "-I", get_module_include_path(),77 "-I", get_module_include_path(),
78 qml_path,78 qml_path,
79 emulator_base=emulators.UbuntuUIToolkitEmulatorBase)79 emulator_base=emulators.UbuntuUIToolkitEmulatorBase,
80 app_type='qt')
8081
81 if (hasattr(self, 'test_qml_file') and82 if (hasattr(self, 'test_qml_file') and
82 isinstance(self.test_qml_file, basestring)):83 isinstance(self.test_qml_file, basestring)):
@@ -85,7 +86,8 @@
85 "/usr/lib/" + arch + "/qt5/bin/qmlscene",86 "/usr/lib/" + arch + "/qt5/bin/qmlscene",
86 "-I", get_module_include_path(),87 "-I", get_module_include_path(),
87 qml_path,88 qml_path,
88 emulator_base=emulators.UbuntuUIToolkitEmulatorBase)89 emulator_base=emulators.UbuntuUIToolkitEmulatorBase,
90 app_type='qt')
8991
90 self.assertThat(92 self.assertThat(
91 self.main_view.visible, Eventually(Equals(True)))93 self.main_view.visible, Eventually(Equals(True)))

Subscribers

People subscribed via source and target branches

to status/vote changes: