From 28d60f94f3b05445f976852fbe3a2ac0559991e3 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Fri, 22 Dec 2017 15:35:08 -0200 Subject: [PATCH] Fix load scope tests in pytest 3.3 Fix #260 --- testing/acceptance_test.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index 99ee201..4daf9ff 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -860,7 +860,13 @@ def parse_tests_and_workers_from_output(lines): result = [] for line in lines: # example match: "[gw0] PASSED test_a.py::test[7]" - m = re.match(r'\[(gw\d)\]\s(.*?)\s(.*::.*)', line.strip()) + m = re.match(r''' + \[(gw\d)\] # worker + \s* + (?:\[\s*\d+%\])? # progress indicator (pytest >=3.3) + \s(.*?) # status string ("PASSED") + \s(.*::.*) # nodeid + ''', line.strip(), re.VERBOSE) if m: worker, status, nodeid = m.groups() result.append((worker, status, nodeid))