[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/19] tests/vm: avoid image presence check and remov
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 02/19] tests/vm: avoid image presence check and removal |
Date: |
Mon, 24 Jun 2019 14:43:20 +0100 |
From: Cleber Rosa <address@hidden>
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
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
- [Qemu-devel] [PULL 19/19] target/i386: fix feature check in hyperv-stub.c, (continued)
- [Qemu-devel] [PULL 19/19] target/i386: fix feature check in hyperv-stub.c, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 10/19] tests/vm: serial console support helpers, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 11/19] tests/vm: openbsd autoinstall, using serial console, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 04/19] tests/vm: add source repos on ubuntu.i386, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 18/19] Makefile: Rename the 'vm-test' target as 'vm-help', Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 01/19] tests/vm: avoid extra compressed image copy, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 07/19] tests/vm: run test builds on snapshot, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 12/19] tests/vm: freebsd autoinstall, using serial console, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 09/19] tests/vm: add vm-boot-{ssh, serial}-<guest> targets, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 17/19] .travis.yml: force a brew update for MacOS builds, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 02/19] tests/vm: avoid image presence check and removal,
Alex Bennée <=
- [Qemu-devel] [PULL 14/19] tests/vm: fedora autoinstall, using serial console, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 16/19] .travis.yml: default the --disable-system build to --static, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 13/19] tests/vm: netbsd autoinstall, using serial console, Alex Bennée, 2019/06/24
- [Qemu-devel] [PULL 15/19] tests/vm: ubuntu.i386: apt proxy setup, Alex Bennée, 2019/06/24