diff options
| -rw-r--r-- | o3d/tests/lab/run_lab_test.py | 2 | ||||
| -rw-r--r-- | o3d/tests/lab/runner_util.py | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/o3d/tests/lab/run_lab_test.py b/o3d/tests/lab/run_lab_test.py index db2f798..028c61a 100644 --- a/o3d/tests/lab/run_lab_test.py +++ b/o3d/tests/lab/run_lab_test.py @@ -308,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: diff --git a/o3d/tests/lab/runner_util.py b/o3d/tests/lab/runner_util.py index cad387f..f6e62c1 100644 --- a/o3d/tests/lab/runner_util.py +++ b/o3d/tests/lab/runner_util.py @@ -141,12 +141,15 @@ def UninstallO3DPlugin(): if util.IsWindows(): installer_path = os.path.join(const.PRODUCT_DIR_PATH, 'o3d.msi') os.system('msiexec.exe /x "%s" /q' % installer_path) - - else: - for path in const.INSTALL_PATHS: - if os.path.exists(path): + + # Forcibly remove plugins. + for path in const.INSTALL_PATHS: + if os.path.exists(path): + if util.IsWindows(): + os.remove(path) + else: os.system('echo g00gl3 | sudo -S rm -rf "%s"' % path) - + return not DoesAnO3DPluginExist() def DoesAnO3DPluginExist(): |