summaryrefslogtreecommitdiffstats
path: root/tests/avocado/avocado_qemu
diff options
context:
space:
mode:
authorJohn Snow2022-05-26 02:09:18 +0200
committerPaolo Bonzini2022-06-06 09:26:54 +0200
commit0e7647aa8a5d5b99a0ffb401ba75f0ae8c171c96 (patch)
tree2e40d1c5572914150863fd5f2026c9b91a30606c /tests/avocado/avocado_qemu
parenttests: add quiet-venv-pip macro (diff)
downloadqemu-0e7647aa8a5d5b99a0ffb401ba75f0ae8c171c96.tar.gz
qemu-0e7647aa8a5d5b99a0ffb401ba75f0ae8c171c96.tar.xz
qemu-0e7647aa8a5d5b99a0ffb401ba75f0ae8c171c96.zip
tests: install "qemu" namespace package into venv
This patch adds the "qemu" namespace package to the $build/tests/venv directory. It does so in "editable" mode, which means that changes to the source python directory will actively be reflected by the venv. This patch also then removes any sys.path hacking from the avocado test scripts directly. By doing this, the environment of where to find these packages is managed entirely by the virtual environment and not by the scripts themselves. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20220526000921.1581503-7-jsnow@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests/avocado/avocado_qemu')
-rw-r--r--tests/avocado/avocado_qemu/__init__.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py
index 39f15c1d51..b656a70c55 100644
--- a/tests/avocado/avocado_qemu/__init__.py
+++ b/tests/avocado/avocado_qemu/__init__.py
@@ -21,6 +21,11 @@ import avocado
from avocado.utils import cloudinit, datadrainer, process, ssh, vmimage
from avocado.utils.path import find_command
+from qemu.machine import QEMUMachine
+from qemu.utils import (get_info_usernet_hostfwd_port, kvm_available,
+ tcg_available)
+
+
#: The QEMU build root directory. It may also be the source directory
#: if building from the source dir, but it's safer to use BUILD_DIR for
#: that purpose. Be aware that if this code is moved outside of a source
@@ -35,12 +40,6 @@ if os.path.islink(os.path.dirname(os.path.dirname(__file__))):
else:
SOURCE_DIR = BUILD_DIR
-sys.path.append(os.path.join(SOURCE_DIR, 'python'))
-
-from qemu.machine import QEMUMachine
-from qemu.utils import (get_info_usernet_hostfwd_port, kvm_available,
- tcg_available)
-
def has_cmd(name, args=None):
"""