Merge lp:~vrruiz/cordova-ubuntu-tests/fix-mobilespecsuite-path into lp:cordova-ubuntu-tests

Proposed by Víctor R. Ruiz
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~vrruiz/cordova-ubuntu-tests/fix-mobilespecsuite-path
Merge into: lp:cordova-ubuntu-tests
Diff against target: 24 lines (+2/-3)
1 file modified
tests/autopilot/cordova_ubuntu/tests/__init__.py (+2/-3)
To merge this branch: bzr merge lp:~vrruiz/cordova-ubuntu-tests/fix-mobilespecsuite-path
Reviewer Review Type Date Requested Status
Robert Bruce Park (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+189982@code.launchpad.net

Commit message

Autopilot: Fix path to Mobile Spec Suite

Description of the change

Autopilot: Fix path to Mobile Spec Suite

To post a comment you must log in.
17. By Víctor R. Ruiz

Remove debug line

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

Approving this because it is obviously correct, however it unfortunately does not solve bug 1235393.

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-10-01 18:39:48 +0000
+++ tests/autopilot/cordova_ubuntu/tests/__init__.py 2013-10-08 22:08:54 +0000
@@ -31,7 +31,7 @@
31 # mobile_spec_path = '/usr/share/cordova-ubuntu-tests/www/'31 # mobile_spec_path = '/usr/share/cordova-ubuntu-tests/www/'
32 LOCAL_WWW_DIR_PATH = os.path.abspath("%s/%s" % (os.path.dirname(os.path.realpath(__file__)),32 LOCAL_WWW_DIR_PATH = os.path.abspath("%s/%s" % (os.path.dirname(os.path.realpath(__file__)),
33 '../../../www/'))33 '../../../www/'))
34 WWW_DIR_PATH = '/usr/share/cordova-ubuntu-tests/www/'34 WWW_DIR_PATH = '/usr/share/cordova-ubuntu-tests/cordovamobilespec/www/'
3535
36 def get_www_dir_path(self):36 def get_www_dir_path(self):
37 if os.path.exists(self.WWW_DIR_PATH):37 if os.path.exists(self.WWW_DIR_PATH):
@@ -44,10 +44,9 @@
44 return self.INSTALLED_CORDOVA_CONTAINER_PATH44 return self.INSTALLED_CORDOVA_CONTAINER_PATH
4545
46 def setUp(self):46 def setUp(self):
47 print self.QML_LAUNCHER, self.LOCAL_CORDOVA_CONTAINER_PATH, self.get_cordova_container_path()
48 params = [self.QML_LAUNCHER, self.get_cordova_container_path()]47 params = [self.QML_LAUNCHER, self.get_cordova_container_path()]
49 if (model() <> 'Desktop'):48 if (model() <> 'Desktop'):
50 params.append('--desktop_file_hint=/usr/share/applications/unitywebappsqmllauncher.desktop')49 params.append('--desktop_file_hint=/usr/share/applications/cordova-ubuntu-tests.desktop')
51 self.app = self.launch_test_application(50 self.app = self.launch_test_application(
52 *params,51 *params,
53 app_type='qt')52 app_type='qt')

Subscribers

People subscribed via source and target branches