Skip test_configdata.test_init_benchmark on Travis in Docker

See #2777
This commit is contained in:
Florian Bruhin 2017-07-04 10:36:25 +02:00
parent 65585b313d
commit 79c11d6008
4 changed files with 5 additions and 1 deletions

View File

@ -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

View File

@ -1,7 +1,7 @@
#!/bin/bash
if [[ $DOCKER ]]; then
docker run --privileged -v $PWD:/outside -e QUTE_BDD_WEBENGINE=$QUTE_BDD_WEBENGINE -e DOCKER=$DOCKER qutebrowser/travis:$DOCKER
docker run --privileged -v $PWD:/outside -e QUTE_BDD_WEBENGINE=$QUTE_BDD_WEBENGINE -e DOCKER=$DOCKER -e CI=$CI qutebrowser/travis:$DOCKER
else
args=()
[[ $TESTENV == docs ]] && args=('--no-authors')

View File

@ -59,6 +59,7 @@ def _apply_platform_markers(config, item):
('frozen', not getattr(sys, 'frozen', False),
"Can only run when frozen"),
('ci', 'CI' not in os.environ, "Only runs on CI."),
('no_ci', 'CI' in os.environ, "Skipped on CI."),
('issue2478', os.name == 'nt' and config.webengine,
"Broken with QtWebEngine on Windows"),
]

View File

@ -41,6 +41,8 @@ def test_init(config_stub):
option.typ.to_str(option.default)
# https://github.com/qutebrowser/qutebrowser/issues/2777
@pytest.mark.no_ci
def test_init_benchmark(benchmark):
benchmark(configdata.init)