summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-12-03 17:43:50 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-12-03 17:43:50 +0100
commit3b7bf3fdf16cda6d59b635dd338af930cee6f1a8 (patch)
tree029c363d6230b426ba8228d9454e9c795a8dda3b
parent4050b81f30b2a715803a43cb57f3bac0666e1307 (diff)
downloadqutebrowser-3b7bf3fdf16cda6d59b635dd338af930cee6f1a8.tar.gz
qutebrowser-3b7bf3fdf16cda6d59b635dd338af930cee6f1a8.zip
Skip mkvenv.py smoke test on Travis
-rw-r--r--tests/end2end/test_mkvenv.py7
-rw-r--r--tox.ini2
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/end2end/test_mkvenv.py b/tests/end2end/test_mkvenv.py
index 430be0279..728649474 100644
--- a/tests/end2end/test_mkvenv.py
+++ b/tests/end2end/test_mkvenv.py
@@ -19,10 +19,15 @@
# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
+import os
from scripts import mkvenv
def test_smoke(tmp_path):
"""Simple smoke test of mkvenv.py."""
- args = mkvenv.parse_args(['--venv-dir', str(tmp_path / 'venv'), '--skip-docs'])
+ argv = ['--venv-dir', str(tmp_path / 'venv'), '--skip-docs']
+ if 'TRAVIS' in os.environ: # Travis doesn't have necessary libs installed
+ argv.append('--skip-smoke-test')
+ print(argv)
+ args = mkvenv.parse_args(argv)
mkvenv.run(args)
diff --git a/tox.ini b/tox.ini
index e71e1f4d3..a8435040f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ setenv =
pyqt{,57,59,510,511,512,513,514,515,5150}: LINK_PYQT_SKIP=true
pyqt{,57,59,510,511,512,513,514,515,5150}: QUTE_BDD_WEBENGINE=true
cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
-passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT_QUICK_BACKEND PY_COLORS
+passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER QT_QUICK_BACKEND PY_COLORS
basepython =
py: {env:PYTHON:python3}
py3: {env:PYTHON:python3}