diff options
| author | Richard Henderson | 2021-10-06 16:06:48 +0200 |
|---|---|---|
| committer | Richard Henderson | 2021-10-06 16:06:48 +0200 |
| commit | 5564f068162d67584a8c35e1efcc051483b9077d (patch) | |
| tree | c0e5fe98c0bddcf2e9efeb0e62d14d9dd59481a6 /tests/qemu-iotests/testenv.py | |
| parent | tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34 (diff) | |
| parent | iotests: Update for pylint 2.11.1 (diff) | |
| download | qemu-5564f068162d67584a8c35e1efcc051483b9077d.tar.gz qemu-5564f068162d67584a8c35e1efcc051483b9077d.tar.xz qemu-5564f068162d67584a8c35e1efcc051483b9077d.zip | |
Merge remote-tracking branch 'remotes/kwolf/tags/for-upstream' into staging
Block layer patches
- Fix I/O errors because of incorrectly detected max_iov
- Fix not white-listed copy-before-write
- qemu-storage-daemon: Only display FUSE help when FUSE is built-in
- iotests: update environment and linting configuration
# gpg: Signature made Wed 06 Oct 2021 03:58:10 AM PDT
# gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg: issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
* remotes/kwolf/tags/for-upstream:
iotests: Update for pylint 2.11.1
iotests/migrate-bitmaps-test: delint
iotests/mirror-top-perms: Adjust imports
iotests/linters: check mypy files all at once
iotests: add 'qemu' package location to PYTHONPATH in testenv
block: introduce max_hw_iov for use in scsi-generic
iotests/image-fleecing: declare requirement of copy-before-write
block: bdrv_insert_node(): don't use bdrv_open()
block: bdrv_insert_node(): doc and style
block: bdrv_insert_node(): fix and improve error handling
block: implement bdrv_new_open_driver_opts()
qemu-storage-daemon: Only display FUSE help when FUSE is built-in
include/block.h: remove outdated comment
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'tests/qemu-iotests/testenv.py')
| -rw-r--r-- | tests/qemu-iotests/testenv.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index 70da0d60c8..99a57a69f3 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -108,12 +108,15 @@ class TestEnv(ContextManager['TestEnv']): SAMPLE_IMG_DIR OUTPUT_DIR """ - self.pythonpath = os.getenv('PYTHONPATH') - if self.pythonpath: - self.pythonpath = self.source_iotests + os.pathsep + \ - self.pythonpath - else: - self.pythonpath = self.source_iotests + + # Path where qemu goodies live in this source tree. + qemu_srctree_path = Path(__file__, '../../../python').resolve() + + self.pythonpath = os.pathsep.join(filter(None, ( + self.source_iotests, + str(qemu_srctree_path), + os.getenv('PYTHONPATH'), + ))) self.test_dir = os.getenv('TEST_DIR', os.path.join(os.getcwd(), 'scratch')) |