| Index: tests/lab/run_lab_test.py
|
| ===================================================================
|
| --- tests/lab/run_lab_test.py (revision 30208)
|
| +++ tests/lab/run_lab_test.py (working copy)
|
| @@ -62,22 +62,21 @@
|
| join = os.path.join
|
|
|
| if util.IsWindows():
|
| - IMAGE_DIFF_PATH = join(const.O3D_PATH, 'third_party', 'pdiff', 'files',
|
| + IMAGE_DIFF_PATH = join(const.BASE_PATH, 'third_party', 'pdiff', 'files',
|
| 'bin', 'win', 'perceptualdiff.exe')
|
| elif util.IsMac():
|
| - IMAGE_DIFF_PATH = join(const.O3D_PATH, 'third_party', 'pdiff', 'files',
|
| + IMAGE_DIFF_PATH = join(const.BASE_PATH, 'third_party', 'pdiff', 'files',
|
| 'bin', 'mac', 'perceptualdiff')
|
| else:
|
| - IMAGE_DIFF_PATH = join(const.O3D_PATH, 'third_party', 'pdiff', 'files',
|
| + IMAGE_DIFF_PATH = join(const.BASE_PATH, 'third_party', 'pdiff', 'files',
|
| 'bin', 'linux', 'perceptualdiff')
|
|
|
| -SELENIUM_TEST_RUNNER_PATH = join(const.O3D_PATH, 'o3d', 'tests', 'selenium',
|
| - 'main.py')
|
| +SELENIUM_TEST_RUNNER_PATH = join(const.TEST_PATH, 'selenium', 'main.py')
|
|
|
| -SELENIUM_JAR_PATH = join(const.O3D_PATH, 'third_party', 'selenium_rc', 'files',
|
| +SELENIUM_JAR_PATH = join(const.BASE_PATH, 'third_party', 'selenium_rc', 'files',
|
| 'selenium-server', 'selenium-server.jar')
|
|
|
| -O3D_REFERENCE_IMAGES_PATH = join(const.O3D_PATH, 'o3d', 'o3d_assets', 'tests',
|
| +O3D_REFERENCE_IMAGES_PATH = join(const.O3D_PATH, 'o3d_assets', 'tests',
|
| 'screenshots')
|
|
|
| SCREENSHOTS_PATH = join(const.RESULTS_PATH,'screenshots')
|
| @@ -193,9 +192,6 @@
|
| Returns:
|
| True on success.
|
| """
|
| - # Run selenium test.
|
| - os.chdir(const.AUTO_PATH)
|
| -
|
| if util.IsWindows():
|
| if not run_util.EnsureWindowsScreenResolution(SCREEN_WIDTH, SCREEN_HEIGHT,
|
| SCREEN_BPP):
|
| @@ -208,8 +204,8 @@
|
| logging.info('** Deleting previous screenshots.')
|
| if os.path.exists(SCREENSHOTS_PATH):
|
| shutil.rmtree(SCREENSHOTS_PATH)
|
| -
|
| - os.makedirs(SCREENSHOTS_PATH)
|
| +
|
| + os.makedirs(SCREENSHOTS_PATH)
|
|
|
| logging.info('** Running selenium tests...')
|
|
|
| @@ -263,7 +259,7 @@
|
| config_path = argv[1]
|
| else:
|
| # Use default config file.
|
| - config_path = os.path.join(const.HOME_PATH, 'test_config.txt')
|
| + config_path = os.path.join(const.HOME, 'test_config.txt')
|
|
|
| # Uninstall/Install plugin.
|
| if not run_util.UninstallO3DPlugin():
|
|
|