Support variable substitution and tryserver- and waterfall-only cmd line args.

scripts/slave/recipe_modules/chromium_tests/steps.py

 # Copyright 2014 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.
 
 import re
 import string
 
 
 class Test(object):
   """
@@ skipping 329 matching lines @@
     gtest_results = self._test_runs[suffix].test_utils.gtest_results
     if not gtest_results.valid:  # pragma: no cover
       return False
     global_tags = gtest_results.raw.get('global_tags', [])
     return 'UNRELIABLE_RESULTS' not in global_tags
 
   def failures(self, api, suffix):
     return self._test_runs[suffix].test_utils.gtest_results.failures
 
 
-def generate_gtest(api, mastername, buildername, test_spec,
-                   enable_swarming=False, scripts_compile_targets=None):
+def get_args_for_test(api, chromium_tests_api, test_spec, bot_update_step):
+  args = test_spec.get('args', [])
+  if chromium_tests_api.is_precommit_mode():
+    args = args + test_spec.get('precommit_args', [])
+  else:
+    args = args + test_spec.get('non_precommit_args', [])
+  # Perform substitution of known variables.
+  substitutions = {
+    'builder_name': api.properties.get('buildername'),
+    'master_name': api.properties.get('mastername'),

[Sergey Berezin, 2016/01/14 01:39:34]

nit: IMHO, master name is an implementation detail of the infrastructure, and
we'll be getting rid of masters anyway in a near future. This would add more
dependencies on master names down the stack, which moves us in the opposite
direction.

If master_name is needed for deduplicating builder names, maybe we should
instead use "mastername:buildername" strings. I don't know...

[iannucci, 2016/01/15 01:48:10]

What sergey said is true... 

That said, if we're substituting properties, I'd prefer the substitution names
to be 1:1 with the property names for easier tracing/debugging ability.

+    'build_revision': bot_update_step.presentation.properties['got_revision']
+  }
+  return [string.Template(arg).safe_substitute(substitutions) for arg in args]
+
+
+def generate_gtest(api, chromium_tests_api, mastername, buildername, test_spec,
+                   bot_update_step, enable_swarming=False,
+                   scripts_compile_targets=None):
   def canonicalize_test(test):
     if isinstance(test, basestring):
       canonical_test = {'test': test}
     else:
       canonical_test = test.copy()
 
     canonical_test.setdefault('shard_index', 0)
     canonical_test.setdefault('total_shards', 1)
     return canonical_test
 
   def get_tests(api):
     return [canonicalize_test(t) for t in
             test_spec.get(buildername, {}).get('gtest_tests', [])]
 
   for test in get_tests(api):
-    args = test.get('args', [])
+    args = get_args_for_test(api, chromium_tests_api, test, bot_update_step)
     if test['shard_index'] != 0 or test['total_shards'] != 1:
       args.extend(['--test-launcher-shard-index=%d' % test['shard_index'],
                    '--test-launcher-total-shards=%d' % test['total_shards']])
     use_swarming = False
     swarming_shards = 1
     swarming_dimension_sets = None
     if enable_swarming:
       swarming_spec = test.get('swarming', {})
       if swarming_spec.get('can_use_on_swarming_builders'):
         use_swarming = True
         swarming_shards = swarming_spec.get('shards', 1)
         swarming_dimension_sets = swarming_spec.get('dimension_sets')
     override_compile_targets = test.get('override_compile_targets', None)
     if use_swarming and swarming_dimension_sets:
       for dimensions in swarming_dimension_sets:
         # Yield potentially multiple invocations of the same test, on
         # different machine configurations.
         yield GTestTest(str(test['test']), args=args, flakiness_dash=True,
                         enable_swarming=True,
                         swarming_shards=swarming_shards,
                         swarming_dimensions=dimensions,
                         override_compile_targets=override_compile_targets)
     else:
       yield GTestTest(str(test['test']), args=args, flakiness_dash=True,
                       enable_swarming=use_swarming,
                       swarming_shards=swarming_shards,
                       override_compile_targets=override_compile_targets)
 
 
-def generate_script(api, mastername, buildername, test_spec,
-                    enable_swarming=False, scripts_compile_targets=None):
+def generate_script(api, chromium_tests_api, mastername, buildername, test_spec,
+                    bot_update_step, enable_swarming=False,
+                    scripts_compile_targets=None):
   for script_spec in test_spec.get(buildername, {}).get('scripts', []):
     yield ScriptTest(
         str(script_spec['name']),
         script_spec['script'],
         scripts_compile_targets,  # pragma: no cover
-        script_spec.get('args', []))
+        get_args_for_test(
+            api, chromium_tests_api, script_spec, bot_update_step))
 
 
 class DynamicPerfTests(Test):
   def __init__(self, perf_id, platform, target_bits, max_battery_temp=None,
                num_device_shards=1, num_host_shards=1, shard_index=0):
     self._perf_id = perf_id
     self._platform = platform
     self._target_bits = target_bits
 
     self._max_battery_temp = max_battery_temp
@@ skipping 694 matching lines @@
       step_result.presentation.logs['invalid_results_exc'] = [str(e)]
       valid = False
       failures = None
     if valid:
       step_result.presentation.step_text += api.test_utils.format_step_text([
         ['failures:', failures]
       ])
     return valid, failures
 
 
-def generate_isolated_script(api, mastername, buildername, test_spec,
-                             enable_swarming=False,
+def generate_isolated_script(api, chromium_tests_api, mastername, buildername,
+                             test_spec, bot_update_step, enable_swarming=False,
                              scripts_compile_targets=None):
   for spec in test_spec.get(buildername, {}).get('isolated_scripts', []):
     use_swarming = False
     swarming_shards = 1
     swarming_dimension_sets = None
     if enable_swarming:
       swarming_spec = spec.get('swarming', {})
       if swarming_spec.get('can_use_on_swarming_builders', False):
         use_swarming = True
         swarming_shards = swarming_spec.get('shards', 1)
         swarming_dimension_sets = swarming_spec.get('dimension_sets')
     name = str(spec['name'])
-    args = args=spec.get('args', [])
+    args = get_args_for_test(api, chromium_tests_api, spec, bot_update_step)
     target_name = spec['isolate_name']
     # This features is only needed for the cases in which the *_run compile
     # target is needed to generate isolate files that contains dynamically libs.
     # TODO(nednguyen, kbr): Remove this once all the GYP builds are converted
     # to GN.
     override_compile_targets = spec.get('override_compile_targets', None)
     if use_swarming:
       if swarming_dimension_sets:
         for dimensions in swarming_dimension_sets:
           # Yield potentially multiple invocations of the same test,
@@ skipping 567 matching lines @@
   def run(self, api, suffix, test_filter=None):
     api.chromium_android.coverage_report(upload=False)
     api.chromium_android.get_changed_lines_for_revision()
     api.chromium_android.incremental_coverage_report()
 
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]