Remove src_base remapping in AddPyAutoFunctionalTest.

build/scripts/master/factory/chromium_commands.py

 # Copyright (c) 2012 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
 import os
@@ skipping 897 matching lines @@
 
     self.AddAnnotatedPerfStep(step_name, None, log_type, factory_properties,
                               cmd_name=self._telemetry_tool,
                               cmd_options=cmd_options,
                               step_name=step_name, timeout=timeout,
                               tool_opts=tool_options, py_script=True,
                               dashboard_url=dashboard_url)
 
   def AddPyAutoFunctionalTest(self, test_name, timeout=1200,
                               workdir=None,
-                              src_base='.',
                               suite=None,
                               test_args=None,
                               factory_properties=None,
                               perf=False):
     """Adds a step to run PyAuto functional tests.
 
     Args:
       test_name: a string describing the test, used to build its logfile name
           and its descriptions in the waterfall display
       timeout: The buildbot timeout for this step, in seconds.  The step will
           fail if the test does not produce any output within this time.
       workdir: the working dir for this step
-      src_base: relative path (from workdir) to src. Not needed if workdir is
-          'build' (the default)
       suite: PyAuto suite to execute.
       test_args: list of PyAuto test arguments.
       factory_properties: A dictionary of factory property values.
       perf: Is this a perf test or not? Requires suite or test_args to be set.
     """
     factory_properties = factory_properties or {}
     factory_properties['step_name'] = test_name
 
     J = self.PathJoin
-    pyauto_script = J(src_base, 'src', 'chrome', 'test', 'functional',
+    pyauto_script = J('src', 'chrome', 'test', 'functional',
                       'pyauto_functional.py')
     args = ['-v']
     if suite:
       args.append('--suite=%s' % suite)
     if test_args:
       args.extend(test_args)
 
     wrapper_args = []
     if not factory_properties.get('use_xvfb_on_linux'):
       wrapper_args.append('--no-xvfb')
 
     if perf and (suite or test_args):
       cmd = self.GetAnnotatedPerfCmd(None, 'graphing', test_name,
                                      cmd_name=pyauto_script, options=args,
                                      factory_properties=factory_properties,
                                      tool_opts=wrapper_args, py_script=True)
     else:
       cmd = self.GetPythonTestCommand(pyauto_script, arg_list=args,
           wrapper_args=wrapper_args, factory_properties=factory_properties)
 
-
-
-    # The following lines adjust the runtest.py path and build_dir to be
-    # relative to src_base.
-    cmd[1] = J(src_base, cmd[1])
-    cmd = map(lambda x:x if x!= self._build_dir else J(src_base, x), cmd)
-
     # Allow setting a custom environment for a PyAuto test.
     env = factory_properties.get('pyauto_env', {'PYTHONPATH': '.'})
 
     self.AddTestStep(chromium_step.AnnotatedCommand, test_name, cmd, env=env,
                      target=self._target, factory_properties=factory_properties,
                      timeout=timeout, workdir=workdir,
                      do_step_if=self.GetTestStepFilter(factory_properties))
 
   def AddDevToolsTests(self, factory_properties=None):
     factory_properties = factory_properties or {}
@@ skipping 692 matching lines @@
   return '%s/%s/%s' % (config.Master.archive_url, archive_type, builder_name)
 
 
 def _GetSnapshotUrl(factory_properties=None, builder_name='%(build_name)s'):
   if not factory_properties or 'gs_bucket' not in factory_properties:
     return (_GetArchiveUrl('snapshots', builder_name), None)
   gs_bucket = factory_properties['gs_bucket']
   gs_bucket = re.sub(r'^gs://', 'http://commondatastorage.googleapis.com/',
                      gs_bucket)
   return ('%s/index.html?path=%s' % (gs_bucket, builder_name), '/')