From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>, Cleber Rosa <crosa@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v1 02/17] tests/vm: avoid image presence check and removal
Date: Thu, 20 Jun 2019 12:29:19 +0200 [thread overview]
Message-ID: <f07129f7-2813-e7e9-79ae-94a026495ab9@redhat.com> (raw)
In-Reply-To: <20190619194021.8240-3-alex.bennee@linaro.org>
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
>
>
next prev parent reply other threads:[~2019-06-20 10:55 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 19:40 [Qemu-devel] [PATCH v1 00/17] testing/next (Travis fixes, more tests/vm) Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 01/17] tests/vm: avoid extra compressed image copy Alex Bennée
2019-06-20 11:07 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 02/17] tests/vm: avoid image presence check and removal Alex Bennée
2019-06-20 10:29 ` Philippe Mathieu-Daudé [this message]
2019-06-20 11:07 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 03/17] tests/vm: pin ubuntu.i386 image Alex Bennée
2019-06-20 10:31 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 04/17] tests/vm: add source repos on ubuntu.i386 Alex Bennée
2019-06-20 11:06 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 05/17] tests/vm: send proxy environment variables over ssh Alex Bennée
2019-06-20 10:38 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 06/17] tests/vm: use ssh with pty unconditionally Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 07/17] tests/vm: run test builds on snapshot Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 08/17] tests/vm: proper guest shutdown Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 09/17] tests/vm: add vm-boot-{ssh, serial}-<guest> targets Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 10/17] tests/vm: serial console support helpers Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 11/17] tests/vm: openbsd autoinstall, using serial console Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 12/17] tests/vm: freebsd " Alex Bennée
2019-06-20 10:39 ` Philippe Mathieu-Daudé
2019-06-20 11:01 ` Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 13/17] tests/vm: netbsd " Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 14/17] tests/vm: fedora " Alex Bennée
2019-06-20 10:36 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 15/17] tests/vm: ubuntu.i386: apt proxy setup Alex Bennée
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 16/17] .travis.yml: default the --disable-system build to --static Alex Bennée
2019-06-20 10:37 ` Philippe Mathieu-Daudé
2019-06-19 19:40 ` [Qemu-devel] [PATCH v1 17/17] .travis.yml: force a brew update for MacOS builds Alex Bennée
2019-06-20 10:37 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f07129f7-2813-e7e9-79ae-94a026495ab9@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=crosa@redhat.com \
--cc=fam@euphon.net \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).