| Message ID | 20210118105720.14824-4-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iotests: Fix 129 and expand 297’s reach | expand |
On 1/18/21 5:57 AM, Max Reitz wrote: > 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> > --- > 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 3705cbb6b3..e40eeb50b9 100755 > --- a/tests/qemu-iotests/124 > +++ b/tests/qemu-iotests/124 > @@ -22,6 +22,7 @@ > > import os > import iotests > +from iotests import try_remove > > > def io_write_patterns(img, patterns): > @@ -29,13 +30,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 52facb8e04..a69b4cdc4e 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -523,12 +523,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): > For what it's worth, at the time I wrote this I barely knew Python. I'd use FileNotFoundError instead now, which is a subclass of OSError. Not your baby, not your problem. Reviewed-by: John Snow <jsnow@redhat.com>
diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124 index 3705cbb6b3..e40eeb50b9 100755 --- a/tests/qemu-iotests/124 +++ b/tests/qemu-iotests/124 @@ -22,6 +22,7 @@ import os import iotests +from iotests import try_remove def io_write_patterns(img, patterns): @@ -29,13 +30,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 52facb8e04..a69b4cdc4e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -523,12 +523,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):