chromium_tests: add an option to disable deapplying patch on some trybots

scripts/slave/recipe_modules/chromium_tests/api.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 collections
 import contextlib
 import copy
 import itertools
 import json
 
@@ skipping 669 matching lines @@
     # TODO(tandrii): remove this per http://crbug.com/635641.
     if self.m.platform.is_linux:
       kwargs['env'] = {'GCLIENT_KILL_GIT_FETCH_AFTER': '1200'}  # 20 minutes.
 
     self.m.bot_update.ensure_checkout(
         patch=False, update_presentation=False, **kwargs)
     self.m.chromium.runhooks(name='runhooks (without patch)')
 
   def run_tests_on_tryserver(self, bot_config, api, tests, bot_update_step,
                              affected_files, mb_mastername=None,
-                             mb_buildername=None):
+                             mb_buildername=None, disable_deapply_patch=False):
     def deapply_patch_fn(failing_tests):
       self.deapply_patch(bot_update_step)
       compile_targets = list(itertools.chain(
           *[t.compile_targets(api) for t in failing_tests]))
       if compile_targets:
         # Remove duplicate targets.
         compile_targets = sorted(set(compile_targets))
         failing_swarming_tests = [
             t.isolate_target(api) for t in failing_tests if t.uses_swarming]
         if failing_swarming_tests:
           self.m.isolate.clean_isolated_files(self.m.chromium.output_dir)
         self.run_mb_and_compile(compile_targets, failing_swarming_tests,
                                 ' (without patch)',
                                 mb_mastername=mb_mastername,
                                 mb_buildername=mb_buildername)
         if failing_swarming_tests:
           self.m.isolate.isolate_tests(self.m.chromium.output_dir,
                                        verbose=True)
 
     deapply_patch = True
     deapply_patch_reason = 'unknown reason'
     for path in RECIPE_CONFIG_PATHS:
       if any([f.startswith(path) for f in affected_files]):
         deapply_patch = False
         deapply_patch_reason = 'build config changes detected'
         break
+    if disable_deapply_patch:
+      deapply_patch = False
+      deapply_patch_reason = 'disabled in recipes'
 
     with self.wrap_chromium_tests(bot_config, tests):
       if deapply_patch:
         self.m.test_utils.determine_new_failures(api, tests, deapply_patch_fn)
       else:
         failing_tests = self.m.test_utils.run_tests_with_patch(api, tests)
         if failing_tests:
           self.m.python.failing_step(
               'test results',
               'TESTS FAILED; retries without patch disabled (%s)'
@@ skipping 126 matching lines @@
       test_runner()
 
   @staticmethod
   # TODO(phajdan.jr): try to get rid of api parameter.
   # We currently have to use it because clients of this dereference
   # chromium_tests, and currently recipe engine does not set up
   # self-reference self.m.chromium_tests in chromium_tests.
   def trybot_steps(api):
     with api.tryserver.set_failure_hash():
       try:
-        bot_config_object, bot_update_step, affected_files, tests = \
-            ChromiumTestsApi._trybot_steps_internal(api)
+        (bot_config_object, bot_update_step, affected_files, tests,
+         disable_deapply_patch) = ChromiumTestsApi._trybot_steps_internal(api)
       finally:
         api.python.succeeding_step('mark: before_tests', '')
 
       if tests:
         api.chromium_tests.run_tests_on_tryserver(
-            bot_config_object, api, tests, bot_update_step, affected_files)
+            bot_config_object, api, tests, bot_update_step, affected_files,
+            disable_deapply_patch=disable_deapply_patch)
 
   @staticmethod
   # TODO(phajdan.jr): try to get rid of api parameter.
   # We currently have to use it because clients of this dereference
   # chromium_tests, and currently recipe engine does not set up
   # self-reference self.m.chromium_tests in chromium_tests.
   def _trybot_steps_internal(api):
     mastername = api.properties.get('mastername')
     buildername = api.properties.get('buildername')
     bot_config = api.chromium_tests.trybots.get(mastername, {}).get(
@@ skipping 101 matching lines @@
     else:
       # Even though the patch doesn't require a compile on this platform,
       # we'd still like to run tests not depending on
       # compiled targets (that's obviously not covered by the
       # 'analyze' step) if any source files change.
       if any(ChromiumTestsApi._is_source_file(api, f) for f in affected_files):
         tests = [t for t in tests if not t.compile_targets(api)]
       else:
         tests = []
 
-    return bot_config_object, bot_update_step, affected_files, tests
+    disable_deapply_patch = not bot_config.get('deapply_patch', True)
+    return (bot_config_object, bot_update_step, affected_files, tests,
+            disable_deapply_patch)
 
   @staticmethod
   def _all_compile_targets(api, tests):
     """Returns the compile_targets for all the Tests in |tests|."""
     return sorted(set(x
                       for test in tests
                       for x in test.compile_targets(api)))
 
   @staticmethod
   def _is_source_file(api, filepath):
     """Returns true iff the file is a source file."""
     _, ext = api.path.splitext(filepath)
     return ext in ['.c', '.cc', '.cpp', '.h', '.java', '.mm']
 
   @staticmethod
   def _tests_in_compile_targets(api, compile_targets, tests):
     """Returns the tests in |tests| that have at least one of their compile
     targets in |compile_targets|."""
     result = []
     for test in tests:
       test_compile_targets = test.compile_targets(api)
       # Always return tests that don't require compile. Otherwise we'd never
       # run them.
       if ((set(compile_targets) & set(test_compile_targets)) or
           not test_compile_targets):
         result.append(test)
     return result