rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skip test_configdata.test_init_benchmark on Travis in Docker

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pytest.ini
View File

@ -14,6 +14,7 @@ markers =
end2end: End to end tests which run qutebrowser as subprocess end2end: End to end tests which run qutebrowser as subprocess
xfail_norun: xfail the test with out running it xfail_norun: xfail the test with out running it
ci: Tests which should only run on CI. 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_todo: Features still missing with QtWebEngine
qtwebengine_skip: Tests not applicable with QtWebEngine qtwebengine_skip: Tests not applicable with QtWebEngine
qtwebkit_skip: Tests not applicable with QtWebKit qtwebkit_skip: Tests not applicable with QtWebKit

2
scripts/dev/ci/travis_run.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
if [[ $DOCKER ]]; then 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 else
args=() args=()
[[ $TESTENV == docs ]] && args=('--no-authors') [[ $TESTENV == docs ]] && args=('--no-authors')

1
tests/conftest.py
View File

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

2
tests/unit/config/test_configdata.py
View File

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