[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 19/67] iotests/045: Honor $IMGOPTS
From: |
Max Reitz |
Subject: |
[PATCH 19/67] iotests/045: Honor $IMGOPTS |
Date: |
Tue, 1 Oct 2019 21:46:27 +0200 |
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/045 | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/tests/qemu-iotests/045 b/tests/qemu-iotests/045
index 01cc038884..781ceb8d19 100755
--- a/tests/qemu-iotests/045
+++ b/tests/qemu-iotests/045
@@ -20,7 +20,7 @@
import os
import iotests
-from iotests import qemu_img
+from iotests import create_test_image, remove_test_image
image0 = os.path.join(iotests.test_dir, 'image0')
image1 = os.path.join(iotests.test_dir, 'image1')
@@ -32,11 +32,11 @@ class TestFdSets(iotests.QMPTestCase):
def setUp(self):
self.vm = iotests.VM()
- qemu_img('create', '-f', iotests.imgfmt, image0, '128K')
- qemu_img('create', '-f', iotests.imgfmt, image1, '128K')
- qemu_img('create', '-f', iotests.imgfmt, image2, '128K')
- qemu_img('create', '-f', iotests.imgfmt, image3, '128K')
- qemu_img('create', '-f', iotests.imgfmt, image4, '128K')
+ create_test_image(image0, '128K')
+ create_test_image(image1, '128K')
+ create_test_image(image2, '128K')
+ create_test_image(image3, '128K')
+ create_test_image(image4, '128K')
self.file0 = open(image0, 'r')
self.file1 = open(image1, 'w+')
self.file2 = open(image2, 'r')
@@ -57,11 +57,11 @@ class TestFdSets(iotests.QMPTestCase):
self.file2.close()
self.file3.close()
self.file4.close()
- os.remove(image0)
- os.remove(image1)
- os.remove(image2)
- os.remove(image3)
- os.remove(image4)
+ remove_test_image(image0)
+ remove_test_image(image1)
+ remove_test_image(image2)
+ remove_test_image(image3)
+ remove_test_image(image4)
def test_query_fdset(self):
result = self.vm.qmp('query-fdsets')
@@ -129,7 +129,7 @@ class TestFdSets(iotests.QMPTestCase):
class TestSCMFd(iotests.QMPTestCase):
def setUp(self):
self.vm = iotests.VM()
- qemu_img('create', '-f', iotests.imgfmt, image0, '128K')
+ create_test_image(image0, '128K')
# Add an unused monitor, to verify it works fine when two monitor
# instances present
self.vm.add_monitor_null()
@@ -137,7 +137,7 @@ class TestSCMFd(iotests.QMPTestCase):
def tearDown(self):
self.vm.shutdown()
- os.remove(image0)
+ remove_test_image(image0)
def _send_fd_by_SCM(self):
ret = self.vm.send_fd_scm(file_path=image0)
--
2.21.0
- [PATCH 12/67] iotests/228: Filter json:{} filenames, (continued)
- [PATCH 12/67] iotests/228: Filter json:{} filenames, Max Reitz, 2019/10/01
- [PATCH 13/67] iotests/242: Hide refcount bit information, Max Reitz, 2019/10/01
- [PATCH 07/67] iotests.py: Filter data_file in filter_img_info, Max Reitz, 2019/10/01
- [PATCH 11/67] iotests/224: Filter json:{} from commit command, Max Reitz, 2019/10/01
- [PATCH 14/67] iotests: Use unsupported_imgopts in Python tests, Max Reitz, 2019/10/01
- [PATCH 10/67] iotests/169: Skip persistent cases for compat=0.10, Max Reitz, 2019/10/01
- [PATCH 15/67] iotests/030: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 18/67] iotests/044: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 16/67] iotests/040: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 17/67] iotests/041: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 19/67] iotests/045: Honor $IMGOPTS,
Max Reitz <=
- [PATCH 21/67] iotests/056: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 22/67] iotests/057: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 23/67] iotests/065: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 20/67] iotests/055: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 24/67] iotests/096: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 25/67] iotests/118: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 28/67] iotests/132: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 26/67] iotests/124: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 27/67] iotests/129: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 29/67] iotests/139: Honor $IMGOPTS, Max Reitz, 2019/10/01