summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-03-30 21:01:55 +0200
committerFlorian Bruhin <me@the-compiler.org>2021-03-31 13:29:54 +0200
commit0a4cb0ef7fbbbf590b3fb0faade280b18b8d0dd7 (patch)
tree5a7117e4abff73e9b5d0c641c8c721976050df0c
parent965ca663a1bc23a4e15a0b381d3b515702c6b926 (diff)
downloadqutebrowser-0a4cb0ef7fbbbf590b3fb0faade280b18b8d0dd7.tar.gz
qutebrowser-0a4cb0ef7fbbbf590b3fb0faade280b18b8d0dd7.zip
ci: Move test_mkvenv.py to update-dependencies
It requires some time and network access, so no need to run it as part of the automated tests. (cherry picked from commit 545a295cf0fc318538a2355f1244cfd2df575af9)
-rw-r--r--.github/workflows/recompile-requirements.yml12
-rw-r--r--tests/end2end/test_mkvenv.py28
2 files changed, 12 insertions, 28 deletions
diff --git a/.github/workflows/recompile-requirements.yml b/.github/workflows/recompile-requirements.yml
index 0765a18be..efdf39950 100644
--- a/.github/workflows/recompile-requirements.yml
+++ b/.github/workflows/recompile-requirements.yml
@@ -30,6 +30,18 @@ jobs:
- name: Recompile requirements
run: "python3 scripts/dev/recompile_requirements.py ${{ github.events.input.environments }}"
id: requirements
+ - name: Install apt dependencies
+ run: |
+ sudo apt-get update
+ sudo apt-get install --no-install-recommends libyaml-dev libegl1-mesa libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 asciidoc python3-venv xvfb
+ - name: Install dependencies
+ run: |
+ python -m pip install -U pip
+ python -m pip install -U -r misc/requirements/requirements-tox.txt
+ - name: Run mkvenv.py
+ run: "xvfb-run python3 scripts/mkvenv.py --dev"
+ - name: Run qutebrowser smoke test
+ run: "xvfb-run .venv/bin/python3 -m qutebrowser --no-err-windows --nowindow --temp-basedir about:blank ':later 500 quit'"
- name: Create pull request
uses: peter-evans/create-pull-request@v3
with:
diff --git a/tests/end2end/test_mkvenv.py b/tests/end2end/test_mkvenv.py
deleted file mode 100644
index b7b8f13b9..000000000
--- a/tests/end2end/test_mkvenv.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-
-# Copyright 2020-2021 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-
-# This file is part of qutebrowser.
-#
-# qutebrowser is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# qutebrowser is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with qutebrowser. If not, see <https://www.gnu.org/licenses/>.
-
-
-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'])
- mkvenv.run(args)