diff options
author | Max Reitz <mreitz@redhat.com> | 2021-01-18 11:57:13 +0100 |
---|---|---|
committer | Max Reitz <mreitz@redhat.com> | 2021-01-26 14:36:37 +0100 |
commit | c5ff5a3caa16f18bea05db4e2326e9162e7a0ba9 (patch) | |
tree | 93756b3bc90e0f3c4a5a4663d4340115958d4900 /tests/qemu-iotests | |
parent | 59aec869822c02cfd0c929b48bfdc6da99cd1665 (diff) |
iotests: Move try_remove to iotests.py
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>
Diffstat (limited to 'tests/qemu-iotests')
-rwxr-xr-x | tests/qemu-iotests/124 | 8 | ||||
-rw-r--r-- | 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): |