Skip to content

GitLab

T
tangled
Commit 5ca9cd68 authored by Andrew Luo's avatar Andrew Luo Committed by Commit Bot
Browse files
Options

Remove expected_failure_on_bot.json file. 

Bug: 928093, 939990
Change-Id: I6832b5f03483e5499179c461030a71b966ca5fae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1823879
Commit-Queue: Andrew Luo <aluo@chromium.org>
Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701206}
parent e534549d
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 74 deletions
android_webview/tools/run_cts.py
View file @ 5ca9cd68
......@@ -34,11 +34,6 @@ _TEST_RUNNER_PATH = os.path.join(
os.path.dirname(__file__), os.pardir, os.pardir,
'build', 'android', 'test_runner.py')
# TODO(crbug.com/928093): remove this file as it is covered by
# webview_cts_gcs_path.json.
_EXPECTED_FAILURES_FILE = os.path.join(
os.path.dirname(__file__), 'cts_config', 'expected_failure_on_bot.json')
_WEBVIEW_CTS_GCS_PATH_FILE = os.path.join(
os.path.dirname(__file__), 'cts_config', 'webview_cts_gcs_path.json')
_ARCH_SPECIFIC_CTS_INFO = ["filename", "unzip_dir", "_origin"]
......@@ -100,20 +95,6 @@ def GetCTSModuleNames(arch, cts_release):
return [os.path.basename(r['apk']) for r in test_runs]
def GetExpectedFailures():
"""Gets list of tests expected to fail in <class>#<method> format.
See _EXPECTED_FAILURES_FILE
"""
with open(_EXPECTED_FAILURES_FILE) as f:
expected_failures_info = json.load(f)
expected_failures = []
for class_name, methods in expected_failures_info.iteritems():
expected_failures.extend(['%s#%s' % (class_name, m['name'])
for m in methods])
return expected_failures
def GetTestRunFilterArg(args, test_run):
""" Merges json file filters with cmdline filters using
test_filter.InitializeFilterFromArgs
......@@ -130,15 +111,11 @@ def GetTestRunFilterArg(args, test_run):
filter_string,
positive_patterns=[i["match"] for i in includes])
excludes = test_run.get("excludes", [])
filter_string = test_filter.AppendPatternsToFilter(
filter_string,
negative_patterns=[e["match"] for e in excludes])
if args.skip_expected_failures:
excludes = test_run.get("excludes", [])
filter_string = test_filter.AppendPatternsToFilter(
filter_string,
negative_patterns=GetExpectedFailures())
negative_patterns=[e["match"] for e in excludes])
if filter_string:
return [TEST_FILTER_OPT + '=' + filter_string]
......
android_webview/tools/run_cts_test.py
View file @ 5ca9cd68
......@@ -34,11 +34,8 @@ class _RunCtsTest(unittest.TestCase):
args.update(kwargs)
return mock.Mock(**args)
def _getSkipString(self, skip_known_failures):
skips = [self._EXCLUDED_TEST.replace('#', '.')]
if skip_known_failures:
skips += [f.replace('#', '.') for f in run_cts.GetExpectedFailures()]
return ':'.join(skips)
def _getSkipString(self):
return self._EXCLUDED_TEST.replace('#', '.')
def testDetermineArch_arm64(self):
logging_mock = mock.Mock()
......@@ -87,114 +84,97 @@ class _RunCtsTest(unittest.TestCase):
msg='Should recommend the highest supported CTS release')
def testNoFilter_SkipExpectedFailures(self):
skip_expected_failures = True
mock_args = self._getArgsMock(skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
mock_args = self._getArgsMock(skip_expected_failures=True)
skip = self._getSkipString()
self.assertEqual([run_cts.TEST_FILTER_OPT + '=-' + skip],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testNoFilter_ExcludedMatches(self):
skip_expected_failures = False
mock_args = self._getArgsMock(skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
self.assertEqual([run_cts.TEST_FILTER_OPT + '=-' + skip],
mock_args = self._getArgsMock(skip_expected_failures=False)
self.assertEqual([],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testFilter_CombinesExcludedMatches(self):
skip_expected_failures = False
mock_args = self._getArgsMock(test_filter='good#test',
skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
self.assertEqual([run_cts.TEST_FILTER_OPT + '=good.test-' + skip],
skip_expected_failures=False)
self.assertEqual([run_cts.TEST_FILTER_OPT + '=good.test'],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testFilter_CombinesAll(self):
skip_expected_failures = True
mock_args = self._getArgsMock(test_filter='good#test',
skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
skip_expected_failures=True)
skip = self._getSkipString()
self.assertEqual([run_cts.TEST_FILTER_OPT + '=good.test-' + skip],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testFilter_ForMultipleTests(self):
skip_expected_failures = True
mock_args = self._getArgsMock(test_filter='good#t1:good#t2',
skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
skip_expected_failures=True)
skip = self._getSkipString()
self.assertEqual([run_cts.TEST_FILTER_OPT + '=good.t1:good.t2-' + skip],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testIsolatedFilter_CombinesExcludedMatches(self):
skip_expected_failures = False
mock_args = self._getArgsMock(isolated_script_test_filter='good#test',
skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
self.assertEqual([run_cts.TEST_FILTER_OPT + '=good.test-' + skip],
skip_expected_failures=False)
self.assertEqual([run_cts.TEST_FILTER_OPT + '=good.test'],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testIsolatedFilter_CombinesAll(self):
skip_expected_failures = True
mock_args = self._getArgsMock(isolated_script_test_filter='good#test',
skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
skip_expected_failures=True)
skip = self._getSkipString()
self.assertEqual([run_cts.TEST_FILTER_OPT + '=good.test-' + skip],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testIsolatedFilter_ForMultipleTests(self):
skip_expected_failures = True
# Isolated test filters use :: to separate matches
mock_args = self._getArgsMock(
isolated_script_test_filter='good#t1::good#t2',
skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
skip_expected_failures=True)
skip = self._getSkipString()
self.assertEqual([run_cts.TEST_FILTER_OPT + '=good.t1:good.t2-' + skip],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testFilterFile_CombinesExcludedMatches(self):
skip_expected_failures = False
with tempfile.NamedTemporaryFile(prefix='cts_run_test') as filter_file:
filter_file.write('suite.goodtest')
filter_file.seek(0)
mock_args = self._getArgsMock(
test_filter_file=filter_file.name,
skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
self.assertEqual([run_cts.TEST_FILTER_OPT + '=suite.goodtest-' + skip],
skip_expected_failures=False)
self.assertEqual([run_cts.TEST_FILTER_OPT + '=suite.goodtest'],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testFilterFile_CombinesAll(self):
skip_expected_failures = True
with tempfile.NamedTemporaryFile(prefix='cts_run_test') as filter_file:
filter_file.write('suite.goodtest')
filter_file.seek(0)
mock_args = self._getArgsMock(
test_filter_file=filter_file.name,
skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
skip_expected_failures=True)
skip = self._getSkipString()
self.assertEqual([run_cts.TEST_FILTER_OPT + '=suite.goodtest-' + skip],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testNegative_Filter(self):
skip_expected_failures = True
mock_args = self._getArgsMock(test_filter='-good#t1:good#t2',
skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
skip_expected_failures=True)
skip = self._getSkipString()
self.assertEqual([run_cts.TEST_FILTER_OPT + '=-good.t1:good.t2:' + skip],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testNegative_IsolatedFilter(self):
skip_expected_failures = True
mock_args = self._getArgsMock(
isolated_script_test_filter='-good#t1::good#t2',
skip_expected_failures=skip_expected_failures)
skip = self._getSkipString(skip_expected_failures)
skip_expected_failures=True)
skip = self._getSkipString()
self.assertEqual([run_cts.TEST_FILTER_OPT + '=-good.t1:good.t2:' + skip],
run_cts.GetTestRunFilterArg(mock_args, self._CTS_RUN))
def testFilter_OverridesInclusion(self):
skip_expected_failures = False
mock_args = self._getArgsMock(test_filter='good#test1',
skip_expected_failures=skip_expected_failures)
skip_expected_failures=False)
cts_run = {'apk': 'module.apk', 'includes': [{'match': 'good#test2'}]}
self.assertEqual([run_cts.TEST_FILTER_OPT + '=good.test1'],
run_cts.GetTestRunFilterArg(mock_args, cts_run))
......
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