summaryrefslogtreecommitdiff
path: root/pytest.ini
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2016-09-05 17:42:15 +0200
committerFlorian Bruhin <git@the-compiler.org>2016-09-05 17:42:15 +0200
commit050507c0a6504bac754d3cdb860a99b491b64a73 (patch)
treeb55deed767b059d8b11ff48aac554470a8723817 /pytest.ini
parentd71aa2c0ba4fcf64e12668a6fc1fd1ad1d9cb930 (diff)
parent59300cb71e8417070b5e3225f6b10ff7b8337393 (diff)
downloadqutebrowser-050507c0a6504bac754d3cdb860a99b491b64a73.tar.gz
qutebrowser-050507c0a6504bac754d3cdb860a99b491b64a73.zip
Merge branch 'webengine-createwindow'
Diffstat (limited to 'pytest.ini')
-rw-r--r--pytest.ini2
1 files changed, 2 insertions, 0 deletions
diff --git a/pytest.ini b/pytest.ini
index b71cc3e75..0d5b86a4c 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -17,6 +17,8 @@ markers =
flaky_once: Try to rerun this test once if it fails
qtwebengine_todo: Features still missing with QtWebEngine
qtwebengine_skip: Tests not applicable with QtWebEngine
+ qtwebkit_skip: Tests not applicable with QtWebKit
+ qtwebengine_createWindow: Tests using createWindow with QtWebEngine (QTBUG-54419)
qt_log_level_fail = WARNING
qt_log_ignore =
^SpellCheck: .*