Merge lp:~robru/cordova-ubuntu-tests/autopilot-py3k into lp:cordova-ubuntu-tests

Proposed by Robert Bruce Park
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 32
Merged at revision: 32
Proposed branch: lp:~robru/cordova-ubuntu-tests/autopilot-py3k
Merge into: lp:cordova-ubuntu-tests
Diff against target: 18 lines (+2/-2)
1 file modified
tests/autopilot/cordova_ubuntu/tests/__init__.py (+2/-2)
To merge this branch: bzr merge lp:~robru/cordova-ubuntu-tests/autopilot-py3k
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) Approve
Review via email: mp+195123@code.launchpad.net

Commit message

Python 3 fixes.

Description of the change

Just a couple nitpicks to make the code compatible with Python 3.

To post a comment you must log in.
Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/autopilot/cordova_ubuntu/tests/__init__.py'
--- tests/autopilot/cordova_ubuntu/tests/__init__.py 2013-11-06 19:53:07 +0000
+++ tests/autopilot/cordova_ubuntu/tests/__init__.py 2013-11-13 20:03:28 +0000
@@ -44,12 +44,12 @@
4444
45 def setUp(self):45 def setUp(self):
46 params = [self.QML_LAUNCHER, self.get_cordova_container_path()]46 params = [self.QML_LAUNCHER, self.get_cordova_container_path()]
47 if (model() <> 'Desktop'):47 if (model() != 'Desktop'):
48 params.append('--desktop_file_hint=/usr/share/applications/cordova-ubuntu-tests.desktop')48 params.append('--desktop_file_hint=/usr/share/applications/cordova-ubuntu-tests.desktop')
49 self.app = self.launch_test_application(49 self.app = self.launch_test_application(
50 *params,50 *params,
51 app_type='qt')51 app_type='qt')
52 print params52 print(params)
53 super(CordovaUbuntuTestCase, self).setUp()53 super(CordovaUbuntuTestCase, self).setUp()
5454
55 def tearDown(self):55 def tearDown(self):

Subscribers

People subscribed via source and target branches