diff options
| author | John Snow | 2022-05-26 02:09:19 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2022-06-06 09:26:54 +0200 |
| commit | f4c66f17051f0dee0e6070c6b78a78e7425b5c96 (patch) | |
| tree | 5512bfe2fecb69082fb06e022da60096ff94c056 /tests/vm/basevm.py | |
| parent | tests: install "qemu" namespace package into venv (diff) | |
| download | qemu-f4c66f17051f0dee0e6070c6b78a78e7425b5c96.tar.gz qemu-f4c66f17051f0dee0e6070c6b78a78e7425b5c96.tar.xz qemu-f4c66f17051f0dee0e6070c6b78a78e7425b5c96.zip | |
tests: use tests/venv to run basevm.py-based scripts
This patch co-opts the virtual environment being used by avocado tests
to also run the basevm.py tests. This is being done in preparation for
for the qemu.qmp package being removed from qemu.git.
As part of the change, remove any sys.path() hacks and treat "qemu" as a
normal third-party import.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220526000921.1581503-8-jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests/vm/basevm.py')
| -rw-r--r-- | tests/vm/basevm.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 254e11c932..d7d0413df3 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -18,9 +18,6 @@ import socket import logging import time import datetime -sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) -from qemu.machine import QEMUMachine -from qemu.utils import get_info_usernet_hostfwd_port, kvm_available import subprocess import hashlib import argparse @@ -31,6 +28,9 @@ import multiprocessing import traceback import shlex +from qemu.machine import QEMUMachine +from qemu.utils import get_info_usernet_hostfwd_port, kvm_available + SSH_KEY_FILE = os.path.join(os.path.dirname(__file__), "..", "keys", "id_rsa") SSH_PUB_KEY_FILE = os.path.join(os.path.dirname(__file__), |