diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-08 20:07:48 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-08 20:07:48 +0000 |
| commit | d700bfda9a1e4f407aecdf501923836184866736 (patch) | |
| tree | 6cf7cc9aea3e4c492bd2c22c98c03591086f389d /chrome/test/chromeos | |
| parent | 42ce94ec8e98df0744cc1dea26b49c084fe185f0 (diff) | |
| download | chromium_src-d700bfda9a1e4f407aecdf501923836184866736.zip chromium_src-d700bfda9a1e4f407aecdf501923836184866736.tar.gz chromium_src-d700bfda9a1e4f407aecdf501923836184866736.tar.bz2 | |
Fix pyauto tests launcher on chromeos.
Review URL: http://codereview.chromium.org/5560011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/chromeos')
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/desktopui_PyAutoFunctionalTests.py b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/desktopui_PyAutoFunctionalTests.py index 2cba5f1..7588ef5 100644 --- a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/desktopui_PyAutoFunctionalTests.py +++ b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_PyAutoFunctionalTests/desktopui_PyAutoFunctionalTests.py @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import os from autotest_lib.client.bin import site_chrome_test class desktopui_PyAutoFunctionalTests(site_chrome_test.ChromeTestBase): @@ -9,6 +10,8 @@ class desktopui_PyAutoFunctionalTests(site_chrome_test.ChromeTestBase): version = 1 def run_once(self): + deps_dir = os.path.join(self.autodir, 'deps') + self.test_binary_dir = '' pyauto_script = '%s/test_src/chrome/test/functional/' \ - 'pyauto_functional.py' % self.dep_dir + 'pyauto_functional.py' % deps_dir self.run_chrome_test(pyauto_script) diff --git a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py index e82252b..d6344cdc 100644 --- a/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py +++ b/chrome/test/chromeos/autotest/files/client/site_tests/desktopui_SyncIntegrationTests/desktopui_SyncIntegrationTests.py @@ -8,7 +8,7 @@ class desktopui_SyncIntegrationTests(site_chrome_test.ChromeTestBase): version = 1 def run_once(self): - password_file = '%s/sync_password.txt' % self.dep_dir + password_file = '%s/sync_password.txt' % self.bindir self.run_chrome_test('sync_integration_tests', ('--password-file-for-test=%s ' + |