[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 64/67] iotests/258: Honor $IMGOPTS
From: |
Max Reitz |
Subject: |
[PATCH 64/67] iotests/258: Honor $IMGOPTS |
Date: |
Tue, 1 Oct 2019 21:47:12 +0200 |
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/258 | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/qemu-iotests/258 b/tests/qemu-iotests/258
index 1372522c7a..3e9505d8d4 100755
--- a/tests/qemu-iotests/258
+++ b/tests/qemu-iotests/258
@@ -20,7 +20,7 @@
# Creator/Owner: Max Reitz <address@hidden>
import iotests
-from iotests import log, qemu_img, qemu_io_silent, \
+from iotests import log, create_test_image, qemu_io_silent, \
filter_qmp_testfiles, filter_qmp_imgfmt
# Returns a node for blockdev-add
@@ -65,22 +65,22 @@ def test_concurrent_finish(write_to_stream_node):
# and the other way around, depending on whether the commit job
# is finalized before stream completes or not.
- with iotests.FilePath('node4.img') as node4_path, \
- iotests.FilePath('node3.img') as node3_path, \
- iotests.FilePath('node2.img') as node2_path, \
- iotests.FilePath('node1.img') as node1_path, \
- iotests.FilePath('node0.img') as node0_path, \
+ with iotests.ImagePath('node4.img') as node4_path, \
+ iotests.ImagePath('node3.img') as node3_path, \
+ iotests.ImagePath('node2.img') as node2_path, \
+ iotests.ImagePath('node1.img') as node1_path, \
+ iotests.ImagePath('node0.img') as node0_path, \
iotests.VM() as vm:
# It is important to use raw for the base layer (so that
# permissions are just handed through to the protocol layer)
- assert qemu_img('create', '-f', 'raw', node0_path, '64M') == 0
+ assert create_test_image(node0_path, '64M', fmt='raw') == 0
stream_throttle=None
commit_throttle=None
for path in [node1_path, node2_path, node3_path, node4_path]:
- assert qemu_img('create', '-f', iotests.imgfmt, path, '64M') == 0
+ assert create_test_image(path, '64M') == 0
if write_to_stream_node:
# This is what (most of the time) makes commit finish
--
2.21.0
- [PATCH 55/67] iotests/237: Honor $IMGOPTS, (continued)
- [PATCH 55/67] iotests/237: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 56/67] iotests/242: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 57/67] iotests/245: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 59/67] iotests/248: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 58/67] iotests/246: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 60/67] iotests/254: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 61/67] iotests/255: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 62/67] iotests/256: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 65/67] iotests/262: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 63/67] iotests/257: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 64/67] iotests/258: Honor $IMGOPTS,
Max Reitz <=
- [PATCH 66/67] iotests.py: Forbid qemu_img*('create', ...), Max Reitz, 2019/10/01
- [PATCH 67/67] iotests.py: Drop qemu_img_log(), qemu_img_create(), Max Reitz, 2019/10/01
- Re: [PATCH 00/67] iotests: Honor $IMGOPTS in Python tests, John Snow, 2019/10/01