forked from Mirror/pmbootstrap
CI: drop support for cached venv + ci runner (MR 2080)
CI started failing with: /builds/ollieparanoid/pmbootstrap/venv/bin/python3: No module named pytest I've briefly tried to fix this with the existing scripts. However, instead of investing more time into that, do the long overdue refactoring of the scripts that involve dropping the venv logic and support for a custon gitlab-ci-runner using some python docker image as base. This configuration hasn't been used for a long time and is probably broken anyway. Refactor the logic to skip the qemu test case in gitlab CI by using pytest markers. The new script is now similar to bpo's .ci/pytest.py.
This commit is contained in:
parent
3d651af763
commit
d38bd6be2b
10 changed files with 78 additions and 154 deletions
|
@ -164,6 +164,7 @@ def is_running(args, programs, timeout=300, sleep_before_retry=1):
|
|||
return False
|
||||
|
||||
|
||||
@pytest.mark.skip_ci
|
||||
def test_none(args, tmpdir, qemu):
|
||||
qemu.run(args, tmpdir)
|
||||
|
||||
|
@ -175,12 +176,14 @@ def test_none(args, tmpdir, qemu):
|
|||
assert is_running(args, ["invalid-process"], 1) is False
|
||||
|
||||
|
||||
@pytest.mark.skip_ci
|
||||
def test_xfce4(args, tmpdir, qemu):
|
||||
qemu.run(args, tmpdir, "xfce4")
|
||||
assert is_running(args, ["xfce4-session", "xfdesktop", "xfce4-panel",
|
||||
"Thunar", "dbus-daemon", "xfwm4"])
|
||||
|
||||
|
||||
@pytest.mark.skip_ci
|
||||
def test_plasma_mobile(args, tmpdir, qemu):
|
||||
# NOTE: Once we have plasma mobile running properly without GL, we can
|
||||
# check for more processes
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue