diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-03-24 14:12:36 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-03-24 14:12:36 +0100 |
| commit | 2f592f7ce6414e3c071eaa6df86bf34b6a213bdf (patch) | |
| tree | e65f177e655544d756c52b880781d27b2016bfa5 /pytest.ini | |
| parent | fdc21e10dd2b8d11d3f2798b8a3a490ec67c9377 (diff) | |
| parent | 41bcada133b7235db698a2354df27585438b6a4b (diff) | |
| download | qutebrowser-2f592f7ce6414e3c071eaa6df86bf34b6a213bdf.tar.gz qutebrowser-2f592f7ce6414e3c071eaa6df86bf34b6a213bdf.zip | |
Merge remote-tracking branch 'origin/pr/5457' into dev
Diffstat (limited to 'pytest.ini')
| -rw-r--r-- | pytest.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pytest.ini b/pytest.ini index 7f4a58de3..4d8ae4bfe 100644 --- a/pytest.ini +++ b/pytest.ini @@ -30,6 +30,7 @@ markers = qtwebkit_skip: Tests not applicable with QtWebKit qtwebengine_flaky: Tests which are flaky (and currently skipped) with QtWebEngine qtwebengine_mac_xfail: Tests which fail on macOS with QtWebEngine + qtwebengine_py_5_15: Tests which require PyQtWebEngine 5.15. this: Used to mark tests during development no_invalid_lines: Don't fail on unparsable lines in end2end tests fake_os: Fake utils.is_* to a fake operating system |