Final changes to get PyAuto official happy with Mac and Win. Use...

factory/chromium_commands.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Set of utilities to add commands to a buildbot factory.
 
 This is based on commands.py and adds chromium-specific commands."""
 
 import logging
@@ skipping 532 matching lines @@
     self.AddTestStep(retcode_command.ReturnCodeCommand, test_name, cmd,
                      timeout=timeout)
 
   def AddPyAutoFunctionalTest(self, test_name, timeout=1200,
                               workdir=None,
                               functional_base=None):
     """Adds a step to run PyAuto functional tests."""
     J = self.PathJoin
     pyauto_script = J('src', 'chrome', 'test', 'functional',
                       'pyauto_functional.py')
-    # in case a '..' prefix is needed
-    if functional_base:
-      pyauto_script = J(functional_base, pyauto_script)
+    # Mapping from self._target_platform to the name of the
+    # extracted chrome-*.zip
+    platmap = {'win32': 'chrome-win32',
+               'darwin': 'chrome-mac',
+               'linux2': 'chrome-linux' }
 
     pyauto_functional_cmd = ['python', pyauto_script, '-v']
     if self._target_platform == 'win32':  # win needs python24
       py24 = J('src', 'third_party', 'python_24', 'python_slave.exe')
       pyauto_functional_cmd = ['cmd', '/C'] + [py24, pyauto_script, '-v']
     elif self._target_platform == 'darwin':
       pyauto_functional_cmd = ['python2.5', pyauto_script, '-v']
     self.AddTestStep(retcode_command.ReturnCodeCommand,
                      test_name,
                      pyauto_functional_cmd,
-                     env={'PYTHONPATH': '.'},
+                     env={'PYTHONPATH': platmap[self._target_platform]},
                      workdir=workdir,
                      timeout=timeout)
 
   def AddWebkitTests(self, factory_properties=None):
     """Adds a step to the factory to run the WebKit layout tests.
 
     Args:
       with_pageheap: if True, page-heap checking will be enabled for test_shell
       test_timeout: buildbot timeout for the test step
       archive_timeout: buildbot timeout for archiving the test results and
@@ skipping 128 matching lines @@
     cmd = [self._python, self._download_and_extract_official_tool,
            '--identifier', identifier,
            # TODO(jrg): for now we are triggered on a timer and always
            # use the latest build.  Instead we should trigger on the
            # presence of new build and pass that info down for a
            # --build N arg.
            '--latest']
     self.AddTestStep(commands.WaterfallLoggingShellCommand,
                      'Download and extract official build', cmd,
                      halt_on_failure=True)