diff options
| author | kkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 16:25:02 +0000 |
|---|---|---|
| committer | kkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 16:25:02 +0000 |
| commit | 9e764024c5bf71994561c278bf7260790d47c880 (patch) | |
| tree | bf0cdf4e9505237a19bfb3ff7d473531bcae2486 /o3d | |
| parent | 6f98000b544f92dc9054d9a839e30a6cc1e8843e (diff) | |
| download | chromium_src-9e764024c5bf71994561c278bf7260790d47c880.zip chromium_src-9e764024c5bf71994561c278bf7260790d47c880.tar.gz chromium_src-9e764024c5bf71994561c278bf7260790d47c880.tar.bz2 | |
Split the selenium browser name into the browser name and browser path for the main.py selenium test runner.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/tests/lab/run_lab_test.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/o3d/tests/lab/run_lab_test.py b/o3d/tests/lab/run_lab_test.py index 9c37338..db2f798 100644 --- a/o3d/tests/lab/run_lab_test.py +++ b/o3d/tests/lab/run_lab_test.py @@ -117,7 +117,7 @@ class TestRunningThread(threading.Thread): self.has_started_event.set() logging.info('Output from running test follows:') - + while True: line = self.test_process.stdout.readline() if line: @@ -220,7 +220,10 @@ def RunTest(browser): # some strange problems/exceptions. args = [const.PYTHON, '-u', SELENIUM_TEST_RUNNER_PATH] - args.append('--browser=' + browser) + browser_parts = browser.split(' ', 1) + args.append('--browser=' + browser_parts[0]) + if len(browser_parts) > 1: + args.append('--browserpath=' + browser_parts[1]) args.append('--servertimeout=80') args.append('--product_dir=' + const.PRODUCT_DIR_PATH) @@ -305,7 +308,7 @@ def main(argv): if not configure_ie.ConfigureIE(): logging.error('Failed to configure IE.') all_test_passed = False - continue + continue # Run selenium tests. if RunTest(sel_name) != 0: |