Fix load scope tests in pytest 3.3

Fix #260
2017-12-22 15:35:08 -02:00
parent ed9f25a0d2
commit 28d60f94f3
1 changed files with 7 additions and 1 deletions
--- 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))