diff options
| author | Vladimir Sementsov-Ogievskiy | 2021-02-05 17:37:17 +0100 |
|---|---|---|
| committer | Eric Blake | 2021-02-12 19:10:11 +0100 |
| commit | 3f7db418d10ee7b48c2ef718f6b66bc3e28282a6 (patch) | |
| tree | 27a6b3a4bf7b0d69a5498b9c3122be3343f0317a /tests/qemu-iotests | |
| parent | iotests/264: move to python unittest (diff) | |
| download | qemu-3f7db418d10ee7b48c2ef718f6b66bc3e28282a6.tar.gz qemu-3f7db418d10ee7b48c2ef718f6b66bc3e28282a6.tar.xz qemu-3f7db418d10ee7b48c2ef718f6b66bc3e28282a6.zip | |
iotests.py: qemu_nbd_popen: remove pid file after use
To not interfere with other qemu_nbd_popen() calls in same test.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210205163720.887197-8-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
| -rw-r--r-- | tests/qemu-iotests/iotests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 00be68eca3..4e758308f2 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -296,7 +296,9 @@ def qemu_nbd_list_log(*args: str) -> str: @contextmanager def qemu_nbd_popen(*args): '''Context manager running qemu-nbd within the context''' - pid_file = file_path("pid") + pid_file = file_path("qemu_nbd_popen-nbd-pid-file") + + assert not os.path.exists(pid_file) cmd = list(qemu_nbd_args) cmd.extend(('--persistent', '--pid-file', pid_file)) @@ -314,6 +316,8 @@ def qemu_nbd_popen(*args): time.sleep(0.01) yield finally: + if os.path.exists(pid_file): + os.remove(pid_file) log('Kill NBD server') p.kill() p.wait() |