Revert 30359 - Change from absolute paths to relative paths to allow tests,et...

o3d/tests/lab/run_lab_test.py

 #!/usr/bin/python2.6.2
 # Copyright 2009, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 44 matching lines @@
 import util
 
 # Resolution to configure video card to before running tests.
 SCREEN_WIDTH = 1280
 SCREEN_HEIGHT = 1024
 SCREEN_BPP = 32
 
 join = os.path.join
 
 if util.IsWindows():
-  IMAGE_DIFF_PATH = join(const.BASE_PATH, 'third_party', 'pdiff', 'files',
+  IMAGE_DIFF_PATH = join(const.O3D_PATH, 'third_party', 'pdiff', 'files', 
                          'bin', 'win', 'perceptualdiff.exe')
 elif util.IsMac():
-  IMAGE_DIFF_PATH = join(const.BASE_PATH, 'third_party', 'pdiff', 'files',
+  IMAGE_DIFF_PATH = join(const.O3D_PATH, 'third_party', 'pdiff', 'files',
                          'bin', 'mac', 'perceptualdiff')
 else:
-  IMAGE_DIFF_PATH = join(const.BASE_PATH, 'third_party', 'pdiff', 'files',
+  IMAGE_DIFF_PATH = join(const.O3D_PATH, 'third_party', 'pdiff', 'files',
                          'bin', 'linux', 'perceptualdiff')
 
-SELENIUM_TEST_RUNNER_PATH = join(const.TEST_PATH, 'selenium', 'main.py')
+SELENIUM_TEST_RUNNER_PATH = join(const.O3D_PATH, 'o3d', 'tests', 'selenium',
+                                 'main.py')
 
-SELENIUM_JAR_PATH = join(const.BASE_PATH, 'third_party', 'selenium_rc', 'files',
+SELENIUM_JAR_PATH = join(const.O3D_PATH, 'third_party', 'selenium_rc', 'files',
                          'selenium-server', 'selenium-server.jar')
 
-O3D_REFERENCE_IMAGES_PATH = join(const.O3D_PATH, 'o3d_assets', 'tests',
+O3D_REFERENCE_IMAGES_PATH = join(const.O3D_PATH, 'o3d', 'o3d_assets', 'tests',
                                  'screenshots')
 
 SCREENSHOTS_PATH = join(const.RESULTS_PATH,'screenshots')
 
 # Set total test timeout to 90 minutes.
 TEST_TIMEOUT_SECS = 60 * 90.0
 
 SELENIUM_BROWSER_PREFIXES = {
   'ie': '*iexplore',
   'ff': '*firefox',
@@ skipping 95 matching lines @@
     
 
 
 def RunTest(browser):
   """Runs tests on |browser|.
   Args:
     browser: the browser to test.
   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):
-      logging.warn('Could not detect/change screen resolution.')
+      logging.error('Failed to configure screen resolution.')
+      return 1
 
+  
+    
   # Clear all screenshots.
   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...')
 
   # -u for unbuffered output.
   # Use Python2.4 for two reasons.  First, this is more or less the standard.
   # Second, if we use Python2.6 or later, we must manually shutdown the
   # httpserver, or the next run will overlap ports, which causes
   # some strange problems/exceptions.
   args = [const.PYTHON, '-u', SELENIUM_TEST_RUNNER_PATH]
 
@@ skipping 33 matching lines @@
   
   if len(argv) > 2:
     logging.error('Usage: run_lab_test.py [test_config_file]')
     return 1
   
   if len(argv) == 2:
     # Use given config file.
     config_path = argv[1]
   else:
     # Use default config file.
-    config_path = os.path.join(const.HOME, 'test_config.txt')
+    config_path = os.path.join(const.HOME_PATH, 'test_config.txt')
 
   # Uninstall/Install plugin.
   if not run_util.UninstallO3DPlugin():
     logging.error('Could not successfully uninstall O3D. Tests will not be run.')
     return 1
   if not run_util.InstallO3DPlugin():
     logging.error('Unable to install O3D plugin. Tests will not be run.')
     return 1
     
   # Grab test configuration info from config file.
@@ skipping 40 matching lines @@
   if all_test_passed:
     logging.info('All tests passed.')
     return 0
   else:
     logging.info('Tests failed.')
     return 1
 
 if __name__ == '__main__':
   code = main(sys.argv)
   sys.exit(code)