Capture/Replay: Show some expectation when skipped tests are run
These tests were marked "PASS or new tests", when failing
which is misleading.
Bug: angleproject:6282
Change-Id: I2adf4a29690f8442682e65e5326d173e4e157842
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3129142
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Cody Northrop <cnorthrop@google.com>
Commit-Queue: Gert Wollny <gert.wollny@collabora.com>
diff --git a/src/tests/capture_replay_tests.py b/src/tests/capture_replay_tests.py
index ceda4af..2762921 100755
--- a/src/tests/capture_replay_tests.py
+++ b/src/tests/capture_replay_tests.py
@@ -760,12 +760,16 @@
return True
return False
- def Filter(self, test_list):
+ def Filter(self, test_list, run_all_tests):
result = {}
for t in test_list:
for key in self.non_pass_results.keys():
if self.non_pass_re[key].match(t) is not None:
result[t] = self.non_pass_results[key]
+ if run_all_tests:
+ for skip in self.skipped_for_capture_tests:
+ if skip.match(t) is not None:
+ result[t] = "'forced skip'"
return result
def IsFlaky(self, test_name):
@@ -915,7 +919,8 @@
test_expectation = TestExpectation(args)
test_names = ParseTestNamesFromTestList(test_list, test_expectation,
args.also_run_skipped_for_capture_tests, logger)
- test_expectation_for_list = test_expectation.Filter(test_names)
+ test_expectation_for_list = test_expectation.Filter(
+ test_names, args.also_run_skipped_for_capture_tests)
# objects created by manager can be shared by multiple processes. We use it to create
# collections that are shared by multiple processes such as job queue or result list.
manager = multiprocessing.Manager()
