[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/69] iotests.py: Add @base_dir to FilePaths etc.
From: |
Max Reitz |
Subject: |
[PULL 15/69] iotests.py: Add @base_dir to FilePaths etc. |
Date: |
Mon, 28 Oct 2019 13:14:07 +0100 |
Specifying this optional parameter allows creating temporary files in
other directories than the test_dir; for example in sock_dir.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/iotests.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 9bfcef1f14..075f4739da 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -386,10 +386,10 @@ class FilePaths(object):
qemu_img('create', img_path, '1G')
# migration_sock_path is automatically deleted
"""
- def __init__(self, names):
+ def __init__(self, names, base_dir=test_dir):
self.paths = []
for name in names:
- self.paths.append(os.path.join(test_dir, file_pattern(name)))
+ self.paths.append(os.path.join(base_dir, file_pattern(name)))
def __enter__(self):
return self.paths
@@ -406,8 +406,8 @@ class FilePath(FilePaths):
"""
FilePath is a specialization of FilePaths that takes a single filename.
"""
- def __init__(self, name):
- super(FilePath, self).__init__([name])
+ def __init__(self, name, base_dir=test_dir):
+ super(FilePath, self).__init__([name], base_dir)
def __enter__(self):
return self.paths[0]
@@ -420,7 +420,7 @@ def file_path_remover():
pass
-def file_path(*names):
+def file_path(*names, base_dir=test_dir):
''' Another way to get auto-generated filename that cleans itself up.
Use is as simple as:
@@ -436,7 +436,7 @@ def file_path(*names):
paths = []
for name in names:
filename = file_pattern(name)
- path = os.path.join(test_dir, filename)
+ path = os.path.join(base_dir, filename)
file_path_remover.paths.append(path)
paths.append(path)
--
2.21.0
- [PULL 06/69] iotests: Test driver whitelisting in 136, (continued)
- [PULL 06/69] iotests: Test driver whitelisting in 136, Max Reitz, 2019/10/28
- [PULL 05/69] iotests: Test driver whitelisting in 093, Max Reitz, 2019/10/28
- [PULL 07/69] iotests: Cache supported_formats(), Max Reitz, 2019/10/28
- [PULL 08/69] hbitmap: handle set/reset with zero length, Max Reitz, 2019/10/28
- [PULL 10/69] block/block-backend: add blk_co_pwritev_part, Max Reitz, 2019/10/28
- [PULL 09/69] block/mirror: simplify do_sync_target_write, Max Reitz, 2019/10/28
- [PULL 11/69] block/mirror: support unaligned write in active mirror, Max Reitz, 2019/10/28
- [PULL 12/69] Revert "mirror: Only mirror granularity-aligned chunks", Max Reitz, 2019/10/28
- [PULL 13/69] iotests: Introduce $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 14/69] iotests.py: Store socket files in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 15/69] iotests.py: Add @base_dir to FilePaths etc.,
Max Reitz <=
- [PULL 16/69] iotests: Filter $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 17/69] iotests: Let common.nbd create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 18/69] iotests/083: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 19/69] iotests/140: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 21/69] iotests/147: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 20/69] iotests/143: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 22/69] iotests/181: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 23/69] iotests/182: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 25/69] iotests/192: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28
- [PULL 24/69] iotests/183: Create socket in $SOCK_DIR, Max Reitz, 2019/10/28