Index: scripts/master/factory/chromium_commands.py |
diff --git a/scripts/master/factory/chromium_commands.py b/scripts/master/factory/chromium_commands.py |
index 8146e72e355b3ed8766d26e07a0a0084ec319ac8..f4abf2b4892432b3c3c17c0b888fa106c7530ce8 100644 |
--- a/scripts/master/factory/chromium_commands.py |
+++ b/scripts/master/factory/chromium_commands.py |
@@ -937,7 +937,8 @@ class ChromiumCommands(commands.FactoryCommands): |
"""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. |
@@ -965,14 +966,15 @@ class ChromiumCommands(commands.FactoryCommands): |
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'], |
@@ -985,6 +987,8 @@ class ChromiumCommands(commands.FactoryCommands): |
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): |