From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-devel@nongnu.org, "Cleber Rosa" <crosa@redhat.com>
Subject: [Qemu-devel] [PULL 02/19] tests/vm: avoid image presence check and removal
Date: Mon, 24 Jun 2019 14:43:20 +0100 [thread overview]
Message-ID: <20190624134337.10532-3-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190624134337.10532-1-alex.bennee@linaro.org>
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>
Tested-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>
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
--
2.20.1
next prev parent reply other threads:[~2019-06-24 14:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 13:43 [Qemu-devel] [PULL 00/19] testing/next (tests/vm, Travis and hyperv build fix) Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 01/19] tests/vm: avoid extra compressed image copy Alex Bennée
2019-06-24 13:43 ` Alex Bennée [this message]
2019-06-24 13:43 ` [Qemu-devel] [PULL 03/19] tests/vm: pin ubuntu.i386 image Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 04/19] tests/vm: add source repos on ubuntu.i386 Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 05/19] tests/vm: send proxy environment variables over ssh Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 06/19] tests/vm: use ssh with pty unconditionally Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 07/19] tests/vm: run test builds on snapshot Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 08/19] tests/vm: proper guest shutdown Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 09/19] tests/vm: add vm-boot-{ssh, serial}-<guest> targets Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 10/19] tests/vm: serial console support helpers Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 11/19] tests/vm: openbsd autoinstall, using serial console Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 12/19] tests/vm: freebsd " Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 13/19] tests/vm: netbsd " Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 14/19] tests/vm: fedora " Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 15/19] tests/vm: ubuntu.i386: apt proxy setup Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 16/19] .travis.yml: default the --disable-system build to --static Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 17/19] .travis.yml: force a brew update for MacOS builds Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 18/19] Makefile: Rename the 'vm-test' target as 'vm-help' Alex Bennée
2019-06-24 13:43 ` [Qemu-devel] [PULL 19/19] target/i386: fix feature check in hyperv-stub.c Alex Bennée
2019-07-01 9:52 ` [Qemu-devel] [PULL 00/19] testing/next (tests/vm, Travis and hyperv build fix) Peter Maydell
2019-07-01 15:07 ` Alex Bennée
2019-07-01 15:58 ` Alex Bennée
2019-07-02 10:10 ` Philippe Mathieu-Daudé
2019-07-02 10:28 ` Alex Bennée
2019-07-02 10:29 ` Peter Maydell
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=20190624134337.10532-3-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=crosa@redhat.com \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--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).