summaryrefslogtreecommitdiff
path: root/pytest.ini
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2017-07-04 10:36:25 +0200
committerFlorian Bruhin <git@the-compiler.org>2017-07-04 15:09:23 +0200
commit79c11d6008392b88d971d5dc5c98890558e80c49 (patch)
tree3518478a95759176925b8cd73f2dbd4d227a22aa /pytest.ini
parent65585b313db55209e3143cbc96ae28ec23b201ca (diff)
downloadqutebrowser-79c11d6008392b88d971d5dc5c98890558e80c49.tar.gz
qutebrowser-79c11d6008392b88d971d5dc5c98890558e80c49.zip
Skip test_configdata.test_init_benchmark on Travis in Docker
See #2777
Diffstat (limited to 'pytest.ini')
-rw-r--r--pytest.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/pytest.ini b/pytest.ini
index a2d2779d9..2028c999f 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -14,6 +14,7 @@ markers =
end2end: End to end tests which run qutebrowser as subprocess
xfail_norun: xfail the test with out running it
ci: Tests which should only run on CI.
+ no_ci: Tests which should not run on CI.
qtwebengine_todo: Features still missing with QtWebEngine
qtwebengine_skip: Tests not applicable with QtWebEngine
qtwebkit_skip: Tests not applicable with QtWebKit