Commit b0b3f586 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Test json generation script: Remove support for remove_gtest_from.

It no longer does anything that remove_from can't do.  No behavior change.

Bug: 843511
Change-Id: I74d3e52d7a9d00271baad9203d72ba7efc777a64
Reviewed-on: https://chromium-review.googlesource.com/1136646Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574995}
parent 2612b07d
......@@ -251,8 +251,7 @@ class BBJSONGenerator(object):
else:
return self.exceptions.get(test_name)
def should_run_on_tester(self, waterfall, tester_name,test_name, test_config,
test_suite_type=None):
def should_run_on_tester(self, waterfall, tester_name,test_name, test_config):
# Currently, the only reason a test should not run on a given tester is that
# it's in the exceptions. (Once the GPU waterfall generation script is
# incorporated here, the rules will become more complex.)
......@@ -260,13 +259,6 @@ class BBJSONGenerator(object):
if not exception:
return True
remove_from = None
if test_suite_type:
# First look for a specific removal for the test suite type,
# e.g. 'remove_gtest_from'.
remove_from = exception.get('remove_' + test_suite_type + '_from')
if remove_from and tester_name in remove_from:
# TODO(kbr): add coverage.
return False # pragma: no cover
remove_from = exception.get('remove_from')
if remove_from:
if tester_name in remove_from:
......@@ -473,8 +465,7 @@ class BBJSONGenerator(object):
def generate_gtest(self, waterfall, tester_name, tester_config, test_name,
test_config):
if not self.should_run_on_tester(
waterfall, tester_name, test_name, test_config,
TestSuiteTypes.GTEST):
waterfall, tester_name, test_name, test_config):
return None
result = copy.deepcopy(test_config)
if 'test' in result:
......
......@@ -294,7 +294,7 @@
},
},
'chrome_public_test_vr_apk': {
'remove_gtest_from': [
'remove_from': [
# chromium.android
'KitKat Tablet Tester',
'Lollipop Tablet Tester',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment