[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/10] iotests.py: qemu_nbd_popen: remove pid file after use
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v2 07/10] iotests.py: qemu_nbd_popen: remove pid file after use |
Date: |
Fri, 5 Feb 2021 19:37:17 +0300 |
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>
---
tests/qemu-iotests/iotests.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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()
--
2.29.2
- [PATCH v2 01/10] block: add new BlockDriver handler: bdrv_cancel_in_flight, (continued)
- [PATCH v2 01/10] block: add new BlockDriver handler: bdrv_cancel_in_flight, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 02/10] block/nbd: implement .bdrv_cancel_in_flight, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 10/10] iotests/264: add backup-cancel test-case, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 04/10] job: add .cancel handler for the driver, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 05/10] block/mirror: implement .cancel job handler, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 06/10] iotests/264: move to python unittest, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 03/10] block/raw-format: implement .bdrv_cancel_in_flight handler, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 08/10] iotests/264: add mirror-cancel test-case, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 07/10] iotests.py: qemu_nbd_popen: remove pid file after use,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v2 09/10] block/backup: implement .cancel job handler, Vladimir Sementsov-Ogievskiy, 2021/02/05
- Re: [PATCH v2 00/10] mirror: cancel nbd reconnect, Eric Blake, 2021/02/12