On 6/19/19 9:40 PM, Alex Bennée wrote:
> From: Cleber Rosa <crosa@redhat.com>
>
> Python's os.rename() will silently replace an existing file,
> so there's no need for the extra check and removal.
>
> Reference: https://docs.python.org/3/library/os.html#os.rename
> Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Message-Id: <20190613130718.3763-3-crosa@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/vm/centos | 2 --
> tests/vm/freebsd | 2 --
> tests/vm/netbsd | 2 --
> tests/vm/openbsd | 2 --
> tests/vm/ubuntu.i386 | 2 --
> 5 files changed, 10 deletions(-)
>
> diff --git a/tests/vm/centos b/tests/vm/centos
> index b00b46a8dc..53976f1c4c 100755
> --- a/tests/vm/centos
> +++ b/tests/vm/centos
> @@ -77,8 +77,6 @@ class CentosVM(basevm.BaseVM):
> self.ssh_root_check("systemctl enable docker")
> self.ssh_root("poweroff")
> self.wait()
> - if os.path.exists(img):
> - os.remove(img)
> os.rename(img_tmp, img)
> return 0
>
> diff --git a/tests/vm/freebsd b/tests/vm/freebsd
> index 5575c23a6f..091be1a065 100755
> --- a/tests/vm/freebsd
> +++ b/tests/vm/freebsd
> @@ -36,8 +36,6 @@ class FreeBSDVM(basevm.BaseVM):
> sys.stderr.write("Extracting the image...\n")
> subprocess.check_call(["ln", "-f", cimg, img_tmp_xz])
> subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz])
> - if os.path.exists(img):
> - os.remove(img)
> os.rename(img_tmp, img)
>
> if __name__ == "__main__":
> diff --git a/tests/vm/netbsd b/tests/vm/netbsd
> index d0508f4465..ee9eaeab50 100755
> --- a/tests/vm/netbsd
> +++ b/tests/vm/netbsd
> @@ -36,8 +36,6 @@ class NetBSDVM(basevm.BaseVM):
> sys.stderr.write("Extracting the image...\n")
> subprocess.check_call(["ln", "-f", cimg, img_tmp_xz])
> subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz])
> - if os.path.exists(img):
> - os.remove(img)
> os.rename(img_tmp, img)
>
> if __name__ == "__main__":
> diff --git a/tests/vm/openbsd b/tests/vm/openbsd
> index 87ec982489..28c7d25e29 100755
> --- a/tests/vm/openbsd
> +++ b/tests/vm/openbsd
> @@ -38,8 +38,6 @@ class OpenBSDVM(basevm.BaseVM):
> sys.stderr.write("Extracting the image...\n")
> subprocess.check_call(["ln", "-f", cimg, img_tmp_xz])
> subprocess.check_call(["xz", "--keep", "-dvf", img_tmp_xz])
> - if os.path.exists(img):
> - os.remove(img)
> os.rename(img_tmp, img)
>
> if __name__ == "__main__":
> diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386
> index a22d137e76..12867b193f 100755
> --- a/tests/vm/ubuntu.i386
> +++ b/tests/vm/ubuntu.i386
> @@ -80,8 +80,6 @@ class UbuntuX86VM(basevm.BaseVM):
> self.ssh_root_check("apt-get install -y libfdt-dev flex bison")
> self.ssh_root("poweroff")
> self.wait()
> - if os.path.exists(img):
> - os.remove(img)
> os.rename(img_tmp, img)
> return 0
>
>