[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/23] iotests.py: Add @base_dir to FilePaths etc.
From: |
Max Reitz |
Subject: |
[PATCH v2 03/23] iotests.py: Add @base_dir to FilePaths etc. |
Date: |
Thu, 17 Oct 2019 15:31:35 +0200 |
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>
---
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 0616129342..b61ff30961 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -375,10 +375,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
@@ -395,8 +395,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]
@@ -409,7 +409,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:
@@ -425,7 +425,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
- [PATCH v2 00/23] iotests: Add and use $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 02/23] iotests.py: Store socket files in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 03/23] iotests.py: Add @base_dir to FilePaths etc.,
Max Reitz <=
- [PATCH v2 05/23] iotests: Let common.nbd create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 04/23] iotests: Filter $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 06/23] iotests/083: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 07/23] iotests/140: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 08/23] iotests/143: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 09/23] iotests/147: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 10/23] iotests/181: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17
- [PATCH v2 13/23] iotests/192: Create socket in $SOCK_DIR, Max Reitz, 2019/10/17