Changes filter list to exclusion list

scripts/slave/recipes/chromium_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.
 
+import re

[iannucci, 2014/07/24 19:08:10]

general disclaimer: imports in recipes are usually dangerous because they might
have platform-specific behavior (leading to non-deterministic test
expectations). Importing 'sys' or 'os' would mean certain doom. Others like
tempfile are non-obviously doomful too.

re happens to be one of the good ones though.

I'm pretty sure you knew all that, but I felt like I had to say it anyway :p

In the future, we'll probably be locking down what system modules are importable
in recipes with a proper error message, but right now it's just code-review
vigilance.

[sky, 2014/07/24 19:15:30]

Good to know. Thanks!

+
 DEPS = [
   'bot_update',
   'chromium',
   'filter',
   'gclient',
   'isolate',
   'itertools',
   'json',
   'path',
   'platform',
@@ skipping 354 matching lines @@
 
 def add_swarming_builder(original, swarming, server='tryserver.chromium'):
   """Duplicates builder config on |server|, adding 'enable_swarming: True'."""
   assert server in BUILDERS
   assert original in BUILDERS[server]['builders']
   assert swarming not in BUILDERS[server]['builders']
   conf = BUILDERS[server]['builders'][original].copy()
   conf['enable_swarming'] = True
   BUILDERS[server]['builders'][swarming] = conf
 
+def should_filter_builder(name, regexs):
+  """Returns true if the builder |name| should be filtered. |regexs| is a list
+  of the regular expressions specifying the builders that should *not* be
+  filtered. If |name| completely matches one of the regular expressions than
+  false is returned, otherwise true."""
+  for regex in regexs:
+    match = re.match(regex, name)
+    if match and match.end() == len(name):
+      return False
+  return True
 
 add_swarming_builder('linux_chromium_rel', 'linux_chromium_rel_swarming')
 add_swarming_builder('win_chromium_rel', 'win_chromium_rel_swarming')
 add_swarming_builder('mac_chromium_rel', 'mac_chromium_rel_swarming')
 
 
 def GenSteps(api):
   def parse_test_spec(test_spec, enable_swarming, should_use_test):
     """Returns a list of tests to run and additional targets to compile.
 
@@ skipping 107 matching lines @@
           'test': 'browser_tests',
           'exclude_builders': ['tryserver.chromium:win_chromium_x64_rel'],
         },
       ]),
       followup_fn=test_spec_followup_fn,
   )
 
   test_spec = api.step_history['read test spec'].json.output
 
   # See if the patch needs to compile on the current platform.
-  if isinstance(test_spec, dict) and \
-        buildername in test_spec.get('filter_builders', []):
+  if isinstance(test_spec, dict) and should_filter_builder(
+    buildername, test_spec.get('non_filter_builders', [])):
     yield api.filter.does_patch_require_compile(
       exclusions=test_spec.get('gtest_tests_filter_exclusions', []))
     if not api.filter.result:
       return
 
   def should_use_test(test):
     """Given a test dict from test spec returns True or False."""
     if 'platforms' in test:
       if api.platform.name not in test['platforms']:
         return False
@@ skipping 208 matching lines @@
         'compile_targets': ['browser_tests_run'],
         'gtest_tests': [
           {
             'test': 'browser_tests',
             'args': '--gtest-filter: *NaCl*',
           }, {
             'test': 'base_tests',
             'args': ['--gtest-filter: *NaCl*'],
           },
         ],
+        'non_filter_builders': ['.*'],

[iannucci, 2014/07/24 19:08:10]

you may want to consider fnmatch instead of regex. It's a bit more user friendly
and should be powerful enough for this purpose.

[sky, 2014/07/24 19:15:30]

I don't feel strongly as to which is more widely known. I'm going to leave it as
a regular expression for now.

       })
     )
   )
 
   yield (
     api.test('checkperms_failure') +
     props() +
     api.platform.name('linux') +
     api.override_step_data(
         'checkperms (with patch)',
@@ skipping 41 matching lines @@
           },
           {
             'test': 'browser_tests',
             'swarming': {
               'can_use_on_swarming_builders': True,
               'shards': 5,
               'platforms': ['linux'],
             },
           },
         ],
+        'non_filter_builders': ['linux_chromium_rel_swarming'],
       })
     ) +
     api.override_step_data(
         'find isolated tests',
         api.isolate.output_json(['base_unittests', 'browser_tests']))
   )
 
   # One target (browser_tests) failed to produce *.isolated file.
   yield (
     api.test('swarming_missing_isolated') +
     props(buildername='linux_chromium_rel_swarming') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests': [
           {
             'test': 'base_unittests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
           {
             'test': 'browser_tests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
         ],
+        'non_filter_builders': ['linux_chromium_rel_swarming'],
       })
     ) +
     api.override_step_data(
         'find isolated tests',
         api.isolate.output_json(['base_unittests']))
   )
 
   # One test (base_unittest) failed on swarming. It is retried with
   # deapplied patch.
   yield (
     api.test('swarming_deapply_patch') +
     props(buildername='linux_chromium_rel_swarming') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
         'gtest_tests': [
           {
             'test': 'base_unittests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
           {
             'test': 'browser_tests',
             'swarming': {'can_use_on_swarming_builders': True},
           },
         ],
+        'non_filter_builders': ['linux_chromium_rel_swarming'],
       })
     ) +
     api.override_step_data(
         'find isolated tests',
         api.isolate.output_json(['base_unittests', 'browser_tests'])) +
     api.override_step_data('[swarming] base_unittests (with patch)',
                            canned_test(passing=False)) +
     api.override_step_data(
         'find isolated tests (2)',
         api.isolate.output_json(['base_unittests']))
   )
 
-  # Tests analyze module by way of making builder match that of filter_builders.
+  # Tests analyze module by not specifying a non_filter_builders.
   yield (
     api.test('no_compile_because_of_analyze') +
     props(buildername='linux_chromium_rel') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
-        'filter_builders': ['linux_chromium_rel'],
       })
     )
   )
 
-  # Tests analyze module by way of making builder match that of filter_builders
-  # and file matching exclusion list. This should result in a compile.
+  # Tests analyze module by way of not specifying non_filter_builders and file
+  # matching exclusion list. This should result in a compile.
   yield (
     api.test('compile_because_of_analyze_matching_exclusion') +
     props(buildername='linux_chromium_rel') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
-        'filter_builders': ['linux_chromium_rel'],
         'gtest_tests_filter_exclusions': ['f.*'],
       })
     )
   )
 
-  # Tests analyze module by way of making builder match that of filter_builders
-  # and analyze result returning true. This should result in a compile.
+  # Tests analyze module by way of not specifying non_filter_builders and
+  # analyze result returning true. This should result in a compile.
   yield (
     api.test('compile_because_of_analyze') +
     props(buildername='linux_chromium_rel') +
     api.platform.name('linux') +
     api.override_step_data('read test spec', api.json.output({
-        'filter_builders': ['linux_chromium_rel'],
       })
     ) +
     api.override_step_data(
       'analyze',
       api.raw_io.stream_output('Found dependency'))
   )