Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: build/util/lib/common/unittest_util.py

Issue 1531013002: enforce ordering of test execution through filtering in test_runner.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add test to trybot config Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/util/lib/common/PRESUBMIT.py ('k') | build/util/lib/common/unittest_util_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/util/lib/common/unittest_util.py
diff --git a/build/util/lib/common/unittest_util.py b/build/util/lib/common/unittest_util.py
index 189f5871c740f046093bf36f69639407214bba78..a4fa8aef4bd3c9dd19d04e40d747fff316fdc603 100644
--- a/build/util/lib/common/unittest_util.py
+++ b/build/util/lib/common/unittest_util.py
@@ -132,22 +132,18 @@ def FilterTestNames(all_tests, gtest_filter):
positive_patterns = ['*']
if pattern_groups[0]:
positive_patterns = pattern_groups[0].split(':')
- negative_patterns = None
+ negative_patterns = []
if len(pattern_groups) > 1:
negative_patterns = pattern_groups[1].split(':')
tests = []
- for test in all_tests:
- # Test name must by matched by one positive pattern.
- for pattern in positive_patterns:
- if fnmatch.fnmatch(test, pattern):
- break
- else:
- continue
- # Test name must not be matched by any negative patterns.
- for pattern in negative_patterns or []:
- if fnmatch.fnmatch(test, pattern):
- break
- else:
- tests += [test]
+ test_set = set()
+ for pattern in positive_patterns:
+ pattern_tests = [
+ test for test in all_tests
+ if (fnmatch.fnmatch(test, pattern)
+ and not any(fnmatch.fnmatch(test, p) for p in negative_patterns)
+ and test not in test_set)]
+ tests.extend(pattern_tests)
+ test_set.update(pattern_tests)
return tests
« no previous file with comments | « build/util/lib/common/PRESUBMIT.py ('k') | build/util/lib/common/unittest_util_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698