Add recipe for split AMP/local CQ.

scripts/slave/recipe_modules/test_utils/api.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.
 
 from slave import recipe_api
 from slave import recipe_util
 
 from .util import GTestResults, TestResults
 
 from RECIPE_MODULES.json.api import JsonOutputPlaceholder
@@ skipping 36 matching lines @@
         # simplifies caller code.
         if section[1]:
           step_text.append('<br/>%s<br/>' % section[0])
           step_text.extend(('%s<br/>' % line for line in section[1]))
       else:  # pragma: no cover
         raise ValueError(
             'Expected a one or two-element list, got %r instead.' % section)
     return ''.join(step_text)
 
   # TODO(martinis) rewrite this. can be written better using 1.5 syntax.
-  def determine_new_failures(self, caller_api, tests, deapply_patch_fn):
+  def determine_new_failures(self, caller_api, tests, deapply_patch_fn,
+                             amp_tests=[]):
     """
     Utility function for running steps with a patch applied, and retrying
     failing steps without the patch. Failures from the run without the patch are
     ignored.
 
     Args:
       caller_api - caller's recipe API; this is needed because self.m here
                    is different than in the caller (different recipe modules
                    get injected depending on caller's DEPS vs. this module's
                    DEPS)
+      amp_tests - iterable of objects of type AMPGTestTest

[Paweł Hajdan Jr., 2015/04/22 16:25:09]

This shouldn't be needed - see my comment in steps.py

       tests - iterable of objects implementing the Test interface above
       deapply_patch_fn - function that takes a list of failing tests
                          and undoes any effect of the previously applied patch
     """
     # Convert iterable to list, since it is enumerated multiple times.
+    amp_tests = list(amp_tests)
     tests = list(tests)
 
     failing_tests = []
     #TODO(martiniss) convert loop
     def run(prefix, tests):
       for t in tests:
         try:
           t.pre_run(caller_api, prefix)
         # TODO(iannucci): Write a test.
         except caller_api.step.StepFailure:  # pragma: no cover
           pass
       for t in tests:
         try:
           t.run(caller_api, prefix)
         # TODO(iannucci): How should exceptions be accumulated/handled here?
         except caller_api.step.StepFailure:
           pass
       for t in tests:
         try:
           t.post_run(caller_api, prefix)
         # TODO(iannucci): Write a test.
         except caller_api.step.StepFailure:  # pragma: no cover
           pass
 
-    run('with patch', tests)
+    with_patch_prefix = 'with patch'
+    for t in amp_tests:
+      t.trigger(caller_api, with_patch_prefix)
+
+    run(with_patch_prefix, tests)
+
+    for t in amp_tests:
+      t.collect(caller_api, with_patch_prefix)
 
     with self.m.step.defer_results():
-      for t in tests:
-        if not t.has_valid_results(caller_api, 'with patch'):
+      for t in (amp_tests + tests):
+        if not t.has_valid_results(caller_api, with_patch_prefix):
           self.m.tryserver.maybe_set_transient_failure_tryjob_result()
           self.m.python.failing_step(t.name, 'TEST RESULTS WERE INVALID')
-        elif t.failures(caller_api, 'with patch'):
+        elif t.failures(caller_api, with_patch_prefix):
           failing_tests.append(t)
     if not failing_tests:
       return
 
     try:
       return deapply_patch_fn(failing_tests)
     except self.m.step.StepFailure:
       self.m.tryserver.set_transient_failure_tryjob_result()
       raise
     finally:
+      # Failing AMP tests will be run locally without the patch
       run('without patch', failing_tests)
       with self.m.step.defer_results():
         for t in failing_tests:
           self._summarize_retried_test(caller_api, t)
 
   def _summarize_retried_test(self, caller_api, test):
     if not test.has_valid_results(caller_api, 'without patch'):
       self.m.tryserver.maybe_set_transient_failure_tryjob_result()
       self.m.python.failing_step(test.name, 'TEST RESULTS WERE INVALID')
 
@@ skipping 63 matching lines @@
     """A placeholder which will expand to
     '--test-launcher-summary-output=/tmp/file'.
 
     Provides the --test-launcher-summary-output flag since --flag=value
     (i.e. a single token in the command line) is the required format.
 
     The test_results will be an instance of the GTestResults class.
     """
     return GTestResultsOutputPlaceholder(self, add_json_log)