Enable automatic graph data generation for the chromium.endure waterfall.

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 919 matching lines @@
                      env=env,
                      workdir=workdir,
                      timeout=timeout,
                      do_step_if=self.GetTestStepFilter(factory_properties))
 
   def AddChromeEndureTest(self, test_class_name, pyauto_test_list,
                           factory_properties, timeout=1200, wpr=False):
     """Adds a step to run PyAuto-based Chrome Endure tests.
 
     Args:
-      test_class_name: A string name for this class of tests.
+      test_class_name: A string name for this class of tests.  For example,
+          'control' for Endure 'control' tests.
       pyauto_test_list: A list of strings, where each string is the full name
           of a pyauto test to run (file.class.test_name).
       factory_properties: A dictionary of factory property values.
       timeout: The buildbot timeout for this step, in seconds.  The step will
           fail if the test does not produce any output within this time.
       wpr: A boolean indicating whether or not to run the test using Web Page
           replay (WPR).  If using WPR, the test will replay webapp interactions
           from a pre-recorded file, rather than using the live site.
     """
     pyauto_script = self.PathJoin('src', 'chrome', 'test', 'functional',
                                   'pyauto_functional.py')
     # Only run on linux for now.
     if not self._target_platform.startswith('linux'):
       return
 
     env = factory_properties.get('test_env', {})
     if 'PYTHONPATH' not in env:
       env['PYTHONPATH'] = '.'
     if not wpr:
       env['ENDURE_NO_WPR'] = '1'
 
     factory_properties = factory_properties.copy()
     for pyauto_test_name in pyauto_test_list:
       tool_opts = []
       if not factory_properties.get('use_xvfb_on_linux'):
         tool_opts = ['--no-xvfb']
 
-      step_name = (test_class_name.replace('-', '_') + '-' +
+      test_name = (test_class_name.replace('-', '_') + '-' +
                    pyauto_test_name[pyauto_test_name.rfind('.') + 1:])
+      step_name = 'endure_' + test_name
       factory_properties['step_name'] = step_name
 
       pyauto_cmd = self.GetAnnotatedPerfCmd(
           gtest_filter=None,
           log_type='endure',
-          test_name=test_class_name,
+          test_name=test_name,
           cmd_name=pyauto_script,
           tool_opts=tool_opts,
           options=['-v'],
           factory_properties=factory_properties,
           py_script=True)
       pyauto_cmd.append(pyauto_test_name)
 
       self.AddTestStep(chromium_step.AnnotatedCommand,
                        step_name,
                        pyauto_cmd,
                        env=env,
                        timeout=timeout,
+                       target=self._target,
+                       factory_properties=factory_properties,
                        do_step_if=self.GetTestStepFilter(factory_properties))
 
   def AddDevToolsTests(self, factory_properties=None):
     factory_properties = factory_properties or {}
     c = self.GetPerfStepClass(factory_properties, 'devtools_perf',
                               process_log.GraphingLogProcessor)
 
     cmd = [self._python, self._devtools_perf_test_tool,
            '--target', self._target,
            '--build-dir', self._build_dir
@@ skipping 581 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), '/')