[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 05/10] iotests: Revert emulator selection to old behaviour
From: |
Kevin Wolf |
Subject: |
[PULL v2 05/10] iotests: Revert emulator selection to old behaviour |
Date: |
Tue, 2 Feb 2021 17:28:29 +0100 |
If the qemu-system-{arch} binary for the host architecture can't be
found, the old 'check' implementation selected the alphabetically first
system emulator binary that it could find. The new Python implementation
just uses the first result of glob.iglob(), which has an undefined
order.
This is a problem that breaks CI because the iotests aren't actually
prepared to run on any emulator. They should be, so this is really a bug
in the failing test cases that should be fixed there, but as a quick
fix, let's revert to the old behaviour to let CI runs succeed again.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210202142802.119999-1-kwolf@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/testenv.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
index b31275f518..1fbec854c1 100644
--- a/tests/qemu-iotests/testenv.py
+++ b/tests/qemu-iotests/testenv.py
@@ -135,7 +135,7 @@ class TestEnv(ContextManager['TestEnv']):
if not os.path.exists(self.qemu_prog):
pattern = root('qemu-system-*')
try:
- progs = glob.iglob(pattern)
+ progs = sorted(glob.iglob(pattern))
self.qemu_prog = next(p for p in progs if isxfile(p))
except StopIteration:
sys.exit("Not found any Qemu executable binary by pattern "
--
2.29.2
- [PULL v2 00/10] Block layer patches, Kevin Wolf, 2021/02/02
- [PULL v2 01/10] MAINTAINERS: Add Vladimir as co-maintainer for Block Jobs, Kevin Wolf, 2021/02/02
- [PULL v2 03/10] block: move blk_exp_close_all() to qemu_cleanup(), Kevin Wolf, 2021/02/02
- [PULL v2 02/10] block: Avoid processing BDS twice in bdrv_set_aio_context_ignore(), Kevin Wolf, 2021/02/02
- [PULL v2 04/10] iotests/297: pylint: ignore too many statements, Kevin Wolf, 2021/02/02
- [PULL v2 05/10] iotests: Revert emulator selection to old behaviour,
Kevin Wolf <=
- [PULL v2 07/10] iotests: Fix -makecheck output, Kevin Wolf, 2021/02/02
- [PULL v2 09/10] block/nvme: Trace NVMe spec version supported by the controller, Kevin Wolf, 2021/02/02
- [PULL v2 08/10] block/nvme: Properly display doorbell stride length in trace event, Kevin Wolf, 2021/02/02
- [PULL v2 06/10] iotests: check: return 1 on failure, Kevin Wolf, 2021/02/02
- [PULL v2 10/10] block: Fix VM size column width in bdrv_snapshot_dump(), Kevin Wolf, 2021/02/02
- Re: [PULL v2 00/10] Block layer patches, Peter Maydell, 2021/02/02