diff options
| -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: |