[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/53] iotests: Move try_remove to iotests.py
From: |
Max Reitz |
Subject: |
[PULL 17/53] iotests: Move try_remove to iotests.py |
Date: |
Tue, 26 Jan 2021 15:19:40 +0100 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210118105720.14824-4-mreitz@redhat.com>
---
tests/qemu-iotests/124 | 8 +-------
tests/qemu-iotests/iotests.py | 11 +++++++----
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index 3b21bc497f..90cdbd8e24 100755
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124
@@ -23,6 +23,7 @@
import os
import iotests
+from iotests import try_remove
def io_write_patterns(img, patterns):
@@ -30,13 +31,6 @@ def io_write_patterns(img, patterns):
iotests.qemu_io('-c', 'write -P%s %s %s' % pattern, img)
-def try_remove(img):
- try:
- os.remove(img)
- except OSError:
- pass
-
-
def transaction_action(action, **kwargs):
return {
'type': action,
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 45cb9bd288..335e6feb70 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -515,12 +515,15 @@ class FilePath:
return False
+def try_remove(img):
+ try:
+ os.remove(img)
+ except OSError:
+ pass
+
def file_path_remover():
for path in reversed(file_path_remover.paths):
- try:
- os.remove(path)
- except OSError:
- pass
+ try_remove(path)
def file_path(*names, base_dir=test_dir):
--
2.29.2
- [PULL 01/53] iotests: fix _check_o_direct, (continued)
- [PULL 01/53] iotests: fix _check_o_direct, Max Reitz, 2021/01/26
- [PULL 02/53] copy-on-read: support preadv/pwritev_part functions, Max Reitz, 2021/01/26
- [PULL 03/53] block: add API function to insert a node, Max Reitz, 2021/01/26
- [PULL 04/53] copy-on-read: add filter drop function, Max Reitz, 2021/01/26
- [PULL 05/53] qapi: add filter-node-name to block-stream, Max Reitz, 2021/01/26
- [PULL 07/53] iotests: add #310 to test bottom node in COR driver, Max Reitz, 2021/01/26
- [PULL 06/53] qapi: copy-on-read filter: add 'bottom' option, Max Reitz, 2021/01/26
- [PULL 08/53] block: include supported_read_flags into BDS structure, Max Reitz, 2021/01/26
- [PULL 11/53] qapi: block-stream: add "bottom" argument, Max Reitz, 2021/01/26
- [PULL 16/53] iotests/297: Rewrite in Python and extend reach, Max Reitz, 2021/01/26
- [PULL 17/53] iotests: Move try_remove to iotests.py,
Max Reitz <=
- [PULL 14/53] block: apply COR-filter to block-stream jobs, Max Reitz, 2021/01/26
[PULL 10/53] stream: rework backing-file changing, Max Reitz, 2021/01/26
[PULL 13/53] block/stream: add s->target_bs, Max Reitz, 2021/01/26
[PULL 12/53] iotests: 30: prepare to COR filter insertion by stream job, Max Reitz, 2021/01/26
[PULL 09/53] copy-on-read: skip non-guest reads if no copy needed, Max Reitz, 2021/01/26
[PULL 20/53] iotests/129: Use throttle node, Max Reitz, 2021/01/26