diff options
| author | Florian Bruhin <me@the-compiler.org> | 2020-07-08 18:11:32 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2020-07-08 18:11:32 +0200 |
| commit | e10c37d153bd29b346552c65a64ef1056bf68769 (patch) | |
| tree | c2bd21e083f212c2f44538922e80a3425f897e65 | |
| parent | 2130af688a0062900573519354d8c3a78d3d62e0 (diff) | |
| download | qutebrowser-e10c37d153bd29b346552c65a64ef1056bf68769.tar.gz qutebrowser-e10c37d153bd29b346552c65a64ef1056bf68769.zip | |
ci: Simplify pytest problem matchers
Let's not match on so much unrelated stuff...
| -rw-r--r-- | scripts/dev/ci/problemmatchers.py | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/scripts/dev/ci/problemmatchers.py b/scripts/dev/ci/problemmatchers.py index e492c714b..df3371d91 100644 --- a/scripts/dev/ci/problemmatchers.py +++ b/scripts/dev/ci/problemmatchers.py @@ -136,49 +136,28 @@ MATCHERS = { "tests": [ { - # BDD tests / normal Python exceptions + # pytest test summary output "severity": "error", "pattern": [ { - "regexp": r'^.*\s+File "(.*)", line (\d+), in .*$', - "file": 1, - "line": 2, - }, - { - "regexp": r"^(\033\[[\d;]+m)*E?\s*(INVALID:)?\s+(\w*Error[^\033]*|\w*Exception[^\033]*)(\033\[0m)?", - "message": 3, - } - ], - }, - { - # pytest stacktraces - # qutebrowser/utils/utils.py:773: AssertionError - # tests/unit/utils/test_utils.py:887: - "severity": "error", - "pattern": [ - { - "regexp": r'^\033\[1m\033\[31m([^\033]*)\033\[0m:(\d+): .*', - "file": 1, - "line": 2, + "regexp": r'^=+ short test summary info =+$', }, { - "regexp": r'^\033\[1m\033\[31mE\s+([^\033]*)\033\[0m$', + "regexp": r"^((ERROR|FAILED) .*)", "message": 1, } ], - }, - { + # pytest error lines # E end2end.fixtures.testprocess.WaitForTimeout: Timed out # after 15000ms waiting for [...] "severity": "error", "pattern": [ { - "regexp": r'^\033\[1m\033\[31mE\s+([^\033]*)\033\[0m$', + "regexp": r'^\033\[1m\033\[31mE [a-zA-Z0-9.]+: ([^\033]*)\033\[0m$', "message": 1, - } + }, ], - }, ] } |