De-duplicate steps between chromium and chromium_trybot recipes

scripts/slave/recipes/blink_trybot.py

 # Copyright 2013 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.
 
 DEPS = [
   'bot_update',
   'chromium',
   'gclient',
   'json',
   'path',
@@ skipping 236 matching lines @@
         'testing': {
           'platform': 'linux',
         },
       },
     },
   },
 }
 
 
 def GenSteps(api):
-  class BlinkTest(api.test_utils.Test):
+  class BlinkTest(api.chromium.steps.Test):

[agable, 2014/06/28 00:05:13]

Can we move this into steps.py with everything else? The mismatch is
incongruous. Alternatively, a blink recipe_module with just this in its own
steps.py, but that'd be more work.

[Paweł Hajdan Jr., 2014/06/28 00:19:01]

Done.

     name = 'webkit_tests'
 
     def __init__(self):
       self.results_dir = api.path['slave_build'].join('layout-test-results')
       self.layout_test_wrapper = api.path['build'].join(
           'scripts', 'slave', 'chromium', 'layout_test_wrapper.py')
 
-    def run(self, suffix):
+    def run(self, api, suffix):
       args = ['--target', api.chromium.c.BUILD_CONFIG,
               '-o', self.results_dir,
               '--build-dir', api.chromium.c.build_dir,
               '--json-test-results', api.json.test_results(add_json_log=False)]
       if suffix == 'without patch':
-        test_list = "\n".join(self.failures('with patch'))
+        test_list = "\n".join(self.failures(api, 'with patch'))
         args.extend(['--test-list', api.raw_io.input(test_list),
                      '--skipped', 'always'])
 
       if 'oilpan' in api.properties['buildername']:
         args.extend(['--additional-expectations',
                      api.path['checkout'].join('third_party', 'WebKit',
                                                'LayoutTests',
                                                'OilpanExpectations')])
 
       def followup_fn(step_result):
@@ skipping 39 matching lines @@
           [
             '--results-dir', self.results_dir,
             '--build-dir', api.chromium.c.build_dir,
             '--build-number', buildnumber,
             '--builder-name', buildername,
             '--gs-bucket', 'gs://chromium-layout-test-archives',
           ] + api.json.property_args(),
           followup_fn=archive_webkit_tests_results_followup
         )
 
-    def has_valid_results(self, suffix):
+    def has_valid_results(self, api, suffix):
       step = api.step_history[self._step_name(suffix)]
       # TODO(dpranke): crbug.com/357866 - note that all comparing against
       # MAX_FAILURES_EXIT_STATUS tells us is that we did not exit early
       # or abnormally; it does not tell us how many failures there actually
       # were, which might be much higher (up to 5000 diffs, where we
       # would bail out early with --exit-after-n-failures) or lower
       # if we bailed out after 100 crashes w/ -exit-after-n-crashes, in
       # which case the retcode is actually 130
       return (step.json.test_results.valid and
               step.retcode <= step.json.test_results.MAX_FAILURES_EXIT_STATUS)
 
-    def failures(self, suffix):
+    def failures(self, api, suffix):
       sn = self._step_name(suffix)
       return api.step_history[sn].json.test_results.unexpected_failures
 
   mastername = api.properties.get('mastername')
   buildername = api.properties.get('buildername')
   master_dict = BUILDERS.get(mastername, {})
   bot_config = master_dict.get('builders', {}).get(buildername)
 
   api.chromium.set_config('blink',
                           **bot_config.get('chromium_config_kwargs', {}))
@@ skipping 38 matching lines @@
 
   if not bot_config['compile_only']:
     def deapply_patch_fn(_failing_steps):
       yield api.bot_update.ensure_checkout(patch=False, always_run=True)
 
       yield (
         api.chromium.runhooks(always_run=True),
         api.chromium.compile(always_run=True),
       )
 
-    yield api.test_utils.determine_new_failures([BlinkTest()], deapply_patch_fn)
+    yield api.test_utils.determine_new_failures(
+        api, [BlinkTest()], deapply_patch_fn)
 
 
 def _sanitize_nonalpha(text):
   return ''.join(c if c.isalnum() else '_' for c in text)
 
 
 def GenTests(api):
   canned_test = api.json.canned_test_output
   with_patch = 'webkit_tests (with patch)'
   without_patch = 'webkit_tests (without patch)'
@@ skipping 94 matching lines @@
   # and compare the lists of failing tests).
   yield (
     api.test('too_many_failures_for_retcode') +
     properties('tryserver.blink', 'linux_blink_rel') +
     api.override_step_data(with_patch,
                            canned_test(passing=False,
                                        num_additional_failures=125)) +
     api.override_step_data(without_patch,
                            canned_test(passing=True, minimal=True))
   )