Merge lp:~elopio/ubuntu-ui-toolkit/get_qmlscene into lp:ubuntu-ui-toolkit

Proposed by Leo Arias
Status: Merged
Approved by: Zsombor Egri
Approved revision: 785
Merged at revision: 790
Proposed branch: lp:~elopio/ubuntu-ui-toolkit/get_qmlscene
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 70 lines (+14/-7)
2 files modified
tests/autopilot/ubuntuuitoolkit/base.py (+12/-0)
tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+2/-7)
To merge this branch: bzr merge lp:~elopio/ubuntu-ui-toolkit/get_qmlscene
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Timo Jyrinki Approve
Review via email: mp+189214@code.launchpad.net

Commit message

Added a public function to get the command to launch qmlscene from autopilot tests.

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looks good to me. If /etc/environment would be read to have the QT_SELECT=qt5 environment variable set, this wouldn't be needed. But the way AP tests are currently executed that doesn't seem to happen.

Built and ran autopilot tests on desktop with qt5-default not installed (qmlscene alone gives error about Qt= - works fine.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
I Ahmad (iahmad) wrote :

Looks good, waiting for Jenkins to say the same..:)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

mako/maguro failures caused by a device package issue. should now be resolved. Re-building.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/364/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2581
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-autolanding/290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/290
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/290/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-vm-saucy/224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4448
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2583
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2583/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2144

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntuuitoolkit/base.py'
2--- tests/autopilot/ubuntuuitoolkit/base.py 2013-09-16 14:57:47 +0000
3+++ tests/autopilot/ubuntuuitoolkit/base.py 2013-10-04 06:27:02 +0000
4@@ -16,6 +16,8 @@
5
6 """Base classes for Autopilot tests using the Ubuntu UI Toolkit."""
7
8+import subprocess
9+
10 from autopilot import (
11 input,
12 platform,
13@@ -23,6 +25,16 @@
14 )
15
16
17+def get_qmlscene_launch_command():
18+ """Return the command to launch qmlscene for autopilot tests."""
19+ # We need to specify qt5 because qtchooser doesn't have a default
20+ # configuration on devices and it seems the environment variable
21+ # QT_SELECT=qt5 doesn't work for autopilot tests. --Mirv - 2013-10-03
22+ arch = subprocess.check_output(
23+ ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
24+ return '/usr/lib/' + arch + '/qt5/bin/qmlscene'
25+
26+
27 class UbuntuUIToolkitAppTestCase(testcase.AutopilotTestCase):
28 """Autopilot test case for applications using the Ubuntu UI Toolkit."""
29
30
31=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
32--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py 2013-09-25 07:52:52 +0000
33+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py 2013-10-04 06:27:02 +0000
34@@ -22,7 +22,6 @@
35 from autopilot.input import Pointer
36 from autopilot.matchers import Eventually
37 from testtools.matchers import Is, Not, Equals
38-import subprocess
39
40 from ubuntuuitoolkit import base, emulators
41
42@@ -80,14 +79,12 @@
43 self.launch_application()
44
45 def launch_application(self):
46- arch = subprocess.check_output(
47- ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
48 qml_file_path = self._write_test_qml_file()
49 self.addCleanup(os.remove, qml_file_path)
50 desktop_file_path = _write_test_desktop_file()
51 self.addCleanup(os.remove, desktop_file_path)
52 self.app = self.launch_test_application(
53- '/usr/lib/' + arch + '/qt5/bin/qmlscene',
54+ base.get_qmlscene_launch_command(),
55 '-I' + _get_module_include_path(),
56 qml_file_path,
57 '--desktop_file_hint={0}'.format(desktop_file_path),
58@@ -120,11 +117,9 @@
59 self.launch_application()
60
61 def launch_application(self):
62- arch = subprocess.check_output(
63- ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
64 desktop_file_path = self._get_desktop_file_path()
65 self.app = self.launch_test_application(
66- '/usr/lib/' + arch + '/qt5/bin/qmlscene',
67+ base.get_qmlscene_launch_command(),
68 "-I" + _get_module_include_path(),
69 self.test_qml_file_path,
70 '--desktop_file_hint={0}'.format(desktop_file_path),

Subscribers

People subscribed via source and target branches

to status/vote changes: