All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Li-Wen Hsu" <lwhsu@freebsd.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"John Snow" <jsnow@redhat.com>, "Peter Xu" <peterx@redhat.com>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Mauro Carvalho Chehab" <mchehab+huawei@kernel.org>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Hanna Reitz" <hreitz@redhat.com>, "Warner Losh" <imp@bsdimp.com>,
	qemu-block@nongnu.org, "Kevin Wolf" <kwolf@redhat.com>,
	"Ed Maste" <emaste@freebsd.org>,
	"Maksim Davydov" <davydov-max@yandex-team.ru>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Kyle Evans" <kevans@freebsd.org>,
	"Michael Roth" <michael.roth@amd.com>,
	"Fabiano Rosas" <farosas@suse.de>,
	"Yonggang Luo" <luoyonggang@gmail.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PULL 07/19] iotests: tolerate being run outside of pyvenv
Date: Mon, 23 Feb 2026 13:28:49 -0500	[thread overview]
Message-ID: <20260223182902.739189-8-jsnow@redhat.com> (raw)
In-Reply-To: <20260223182902.739189-1-jsnow@redhat.com>

Modify the iotests environment preparation so that it can detect when it
is being run outside of the configure-time virtual environment and give
a warning to the user, suggesting the use of the meson run script
instead.

As a bonus, since the test executor itself does not actually rely on
anything in the configure-time venv in and of itself, it is possible to
just modify the python executable it uses for launching tests to be the
correct, configured venv that has access to qemu.qmp and other test
dependencies.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20260218213416.674483-9-jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/qemu-iotests/testenv.py | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
index 29caaa8a349..c357e6ebf50 100644
--- a/tests/qemu-iotests/testenv.py
+++ b/tests/qemu-iotests/testenv.py
@@ -20,6 +20,7 @@
 import sys
 import tempfile
 from pathlib import Path
+import shlex
 import shutil
 import collections
 import contextlib
@@ -140,7 +141,29 @@ def init_binaries(self) -> None:
              PYTHON (for bash tests)
              QEMU_PROG, QEMU_IMG_PROG, QEMU_IO_PROG, QEMU_NBD_PROG, QSD_PROG
         """
-        self.python = sys.executable
+        self.python = str(Path(sys.executable).absolute())
+
+        # QEMU configure-time venv python executable
+        venv_python = Path(
+            os.path.join(self.build_root, "pyvenv", "bin", "python3")
+        ).absolute()
+
+        if self.python != str(venv_python):
+            runpath = os.path.join(self.build_root, "run")
+            cmd = ' '.join(shlex.quote(x) for x in sys.argv)
+            print(
+                "\n\033[93m\033[1mWARNING\033[0m: "
+                "iotests is being run from outside of the configure-time "
+                "python virtual environment\n\n"
+                f"current python: {self.python}\n"
+                f"pyvenv python:  {venv_python}\n\n"
+                "Individual python tests will be executed inside the pyvenv,\n"
+                "but the test runner will continue to run outside.\n\n"
+                "\033[1mPlease use the meson run script:\033[0m\n"
+                f"\t{runpath} {cmd}\n",
+                file=sys.stderr
+            )
+            self.python = str(venv_python)
 
         def root(*names: str) -> str:
             return os.path.join(self.build_root, *names)
-- 
2.53.0



  parent reply	other threads:[~2026-02-23 18:32 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-23 18:28 [PULL 00/19] Python patches John Snow
2026-02-23 18:28 ` [PULL 01/19] python/mkvenv: create timestamp file for each group "ensured" John Snow
2026-02-23 18:28 ` [PULL 02/19] python/mkvenv: bump 'qemu.qmp' dependency for testdeps John Snow
2026-02-23 18:28 ` [PULL 03/19] python/mkvenv: add 'tooling' and 'functests' dependency groups John Snow
2026-02-23 18:28 ` [PULL 04/19] python/mkvenv: add mechanism to install local package(s) John Snow
2026-02-23 18:28 ` [PULL 05/19] meson, mkvenv: add functests custom target John Snow
2026-02-23 18:28 ` [PULL 06/19] tests: Use configured python to run GitLab iotests John Snow
2026-02-23 18:28 ` John Snow [this message]
2026-02-23 18:28 ` [PULL 08/19] tests: use "run" script to execute device-crash-test John Snow
2026-02-23 18:28 ` [PULL 09/19] tests/lcitool: update lcitool to latest version John Snow
2026-02-23 18:28 ` [PULL 10/19] tests/lcitool: add python3 wheel and setuptools deps for qemu John Snow
2026-02-23 18:28 ` [PULL 11/19] python: add vendored qemu.qmp package John Snow
2026-02-23 18:28 ` [PULL 12/19] meson, mkvenv: make functional tests depend on functests group John Snow
2026-02-23 18:28 ` [PULL 13/19] meson, mkvenv: add qemu.git/python/qemu package to pythondeps.toml John Snow
2026-02-23 18:28 ` [PULL 14/19] configure: unconditionally install "tooling" group John Snow
2026-02-23 18:28 ` [PULL 15/19] tests: replace check-venv with vm-venv target John Snow
2026-02-23 18:28 ` [PULL 16/19] scripts: nudge users to use 'run' script for scripts that import qemu.qmp John Snow
2026-02-23 18:28 ` [PULL 17/19] python: delete qemu.qmp John Snow
2026-02-23 18:29 ` [PULL 18/19] python: update README.rst to reflect qemu.qmp's removal John Snow
2026-02-23 18:29 ` [PULL 19/19] python: add setuptools and wheel dependencies John Snow
2026-02-24 11:32 ` [PULL 00/19] Python patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260223182902.739189-8-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=crosa@redhat.com \
    --cc=davydov-max@yandex-team.ru \
    --cc=emaste@freebsd.org \
    --cc=farosas@suse.de \
    --cc=hreitz@redhat.com \
    --cc=imp@bsdimp.com \
    --cc=kevans@freebsd.org \
    --cc=kwolf@redhat.com \
    --cc=luoyonggang@gmail.com \
    --cc=lwhsu@freebsd.org \
    --cc=marcandre.lureau@redhat.com \
    --cc=mchehab+huawei@kernel.org \
    --cc=michael.roth@amd.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=vsementsov@yandex-team.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.