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>

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,

tests/qemu-iotests/iotests.py

@@ -515,13 +515,16 @@ class FilePath:
         return False
 
 
-def file_path_remover():
-    for path in reversed(file_path_remover.paths):
+def try_remove(img):
     try:
-            os.remove(path)
+        os.remove(img)
     except OSError:
         pass
 
+def file_path_remover():
+    for path in reversed(file_path_remover.paths):
+        try_remove(path)
+
 
 def file_path(*names, base_dir=test_dir):
     ''' Another way to get auto-generated filename that cleans itself up.