diff options
author | Florian Bruhin <git@the-compiler.org> | 2018-02-26 07:26:24 +0100 |
---|---|---|
committer | Florian Bruhin <git@the-compiler.org> | 2018-02-26 07:26:24 +0100 |
commit | 353753c03c66fd048fc66d002b8ab8a7a0e11ff2 (patch) | |
tree | 4359203d622487b9475d46ddac32bf1cec0af8d3 /pytest.ini | |
parent | de0aa32c11dadc373369e586021d2c4a98223e34 (diff) | |
parent | 76bf35cbdd9fa2cea125a4d763da7bbe6ee5a2bd (diff) | |
download | qutebrowser-353753c03c66fd048fc66d002b8ab8a7a0e11ff2.tar.gz qutebrowser-353753c03c66fd048fc66d002b8ab8a7a0e11ff2.zip |
Merge remote-tracking branch 'origin/pr/3620'
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 89571aebc..d6226c03b 100644 --- a/pytest.ini +++ b/pytest.ini @@ -27,6 +27,7 @@ markers = no_invalid_lines: Don't fail on unparseable lines in end2end tests issue2478: Tests which are broken on Windows with QtWebEngine, https://github.com/qutebrowser/qutebrowser/issues/2478 issue3572: Tests which are broken with QtWebEngine and Qt 5.10, https://github.com/qutebrowser/qutebrowser/issues/3572 + qtbug60673: Tests which are broken if the conversion from orange selection to real selection is flakey fake_os: Fake utils.is_* to a fake operating system unicode_locale: Tests which need an unicode locale to work qt_log_level_fail = WARNING |