[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 9/9] tests: run 'device-crash-test' from tests/venv
From: |
John Snow |
Subject: |
[PATCH 9/9] tests: run 'device-crash-test' from tests/venv |
Date: |
Wed, 25 May 2022 20:09:21 -0400 |
Remove the sys.path hacking from device-crash-test, and add in a little
user-friendly message for anyone who was used to running this script
directly from the source tree.
Modify the GitLab job recipes to create the tests/venv first, then run
device-crash-test from that venv.
Signed-off-by: John Snow <jsnow@redhat.com>
---
.gitlab-ci.d/buildtest.yml | 8 +++++---
scripts/device-crash-test | 14 +++++++++++---
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index e9620c30748..fde29c35aa3 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -110,7 +110,8 @@ crash-test-debian:
IMAGE: debian-amd64
script:
- cd build
- - scripts/device-crash-test -q ./qemu-system-i386
+ - make check-venv
+ - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-i386
build-system-fedora:
extends: .native_build_job_template
@@ -155,8 +156,9 @@ crash-test-fedora:
IMAGE: fedora
script:
- cd build
- - scripts/device-crash-test -q ./qemu-system-ppc
- - scripts/device-crash-test -q ./qemu-system-riscv32
+ - make check-venv
+ - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-ppc
+ - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-riscv32
build-system-centos:
extends: .native_build_job_template
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index a203b3fdea2..73bcb986937 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -33,10 +33,18 @@ import re
import random
import argparse
from itertools import chain
+from pathlib import Path
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python'))
-from qemu.machine import QEMUMachine
-from qemu.qmp import ConnectError
+try:
+ from qemu.machine import QEMUMachine
+ from qemu.qmp import ConnectError
+except ModuleNotFoundError as exc:
+ path = Path(__file__).resolve()
+ print(f"Module '{exc.name}' not found.")
+ print(" Try 'make check-venv' from your build directory,")
+ print(" and then one way to run this script is like so:")
+ print(f' > $builddir/tests/venv/bin/python3 "{path}"')
+ sys.exit(1)
logger = logging.getLogger('device-crash-test')
dbg = logger.debug
--
2.34.1
- [PATCH 4/9] tests: silence pip upgrade warnings during venv creation, (continued)
- [PATCH 6/9] tests: install "qemu" namespace package into venv, John Snow, 2022/05/25
- [PATCH 7/9] tests: use tests/venv to run basevm.py-based scripts, John Snow, 2022/05/25
- [PATCH 9/9] tests: run 'device-crash-test' from tests/venv,
John Snow <=
- [PATCH 8/9] tests: add python3-venv to debian10.docker, John Snow, 2022/05/25
- Re: [PATCH 0/9] tests, python: prepare to expand usage of test venv, John Snow, 2022/05/26
- Re: [PATCH 0/9] tests, python: prepare to expand usage of test venv, John Snow, 2022/05/27