Re: [PATCH] qemu-iotests: Fix FilePaths cleanup

[Eric Blake]

On 8/20/20 4:19 PM, Nir Soffer wrote:
> If os.remove() fails to remove one of the paths, for example if the file
> was removed by the test, the cleanup loop would exit silently, without
> removing the rest of the files.
>
> Signed-off-by: Nir Soffer <nsoffer@redhat.com>
> ---
>   dtc                           | 2 +-
>   tests/qemu-iotests/iotests.py | 8 ++++----
>   2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/dtc b/dtc
> index 85e5d83984..88f18909db 160000
> --- a/dtc
> +++ b/dtc
> @@ -1 +1 @@
> -Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647
> +Subproject commit 88f18909db731a627456f26d779445f84e449536

Modulo the unintended submodule bump,

> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 717b5b652c..16a04df8a3 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -468,11 +468,11 @@ class FilePaths:
>           return self.paths
>   
>       def __exit__(self, exc_type, exc_val, exc_tb):
> -        try:
> -            for path in self.paths:
> +        for path in self.paths:
> +            try:
>                   os.remove(path)
> -        except OSError:
> -            pass
> +            except OSError:
> +                pass
>           return False

Reviewed-by: Eric Blake <eblake@redhat.com>

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org