[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 55/67] iotests/237: Honor $IMGOPTS
From: |
Max Reitz |
Subject: |
[PATCH 55/67] iotests/237: Honor $IMGOPTS |
Date: |
Tue, 1 Oct 2019 21:47:03 +0200 |
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/237 | 11 +++++------
tests/qemu-iotests/237.out | 6 ------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/tests/qemu-iotests/237 b/tests/qemu-iotests/237
index 34ff4b55db..179eae87dc 100755
--- a/tests/qemu-iotests/237
+++ b/tests/qemu-iotests/237
@@ -22,7 +22,7 @@
import math
import iotests
-from iotests import imgfmt
+from iotests import imgfmt, create_test_image
iotests.script_initialize(supported_fmts=['vmdk'],
# All options are ignored
@@ -38,9 +38,9 @@ def blockdev_create(vm, options):
iotests.log("")
with iotests.FilePath('t.vmdk') as disk_path, \
- iotests.FilePath('t.vmdk.1') as extent1_path, \
- iotests.FilePath('t.vmdk.2') as extent2_path, \
- iotests.FilePath('t.vmdk.3') as extent3_path, \
+ iotests.ImagePath('t.vmdk.1') as extent1_path, \
+ iotests.ImagePath('t.vmdk.2') as extent2_path, \
+ iotests.ImagePath('t.vmdk.3') as extent3_path, \
iotests.VM() as vm:
#
@@ -175,8 +175,7 @@ with iotests.FilePath('t.vmdk') as disk_path, \
iotests.log("")
for path in [ extent1_path, extent2_path, extent3_path ]:
- msg = iotests.qemu_img_pipe('create', '-f', imgfmt, path, '0')
- iotests.log(msg, [iotests.filter_testfiles])
+ assert create_test_image(path, 0) == 0
vm.add_blockdev('driver=file,filename=%s,node-name=ext1' % (extent1_path))
vm.add_blockdev('driver=file,filename=%s,node-name=ext2' % (extent2_path))
diff --git a/tests/qemu-iotests/237.out b/tests/qemu-iotests/237.out
index a8c800bfad..c32b970363 100644
--- a/tests/qemu-iotests/237.out
+++ b/tests/qemu-iotests/237.out
@@ -129,12 +129,6 @@ Job failed: Cannot find device=this doesn't exist nor
node_name=this doesn't exi
=== Other subformats ===
-Formatting 'TEST_DIR/PID-t.vmdk.1', fmt=vmdk size=0 compat6=off
hwversion=undefined
-
-Formatting 'TEST_DIR/PID-t.vmdk.2', fmt=vmdk size=0 compat6=off
hwversion=undefined
-
-Formatting 'TEST_DIR/PID-t.vmdk.3', fmt=vmdk size=0 compat6=off
hwversion=undefined
-
== Missing extent ==
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options":
{"driver": "vmdk", "file": "node0", "size": 33554432, "subformat":
"monolithicFlat"}}}
--
2.21.0
- [PATCH 45/67] iotests/208: Honor $IMGOPTS, (continued)
- [PATCH 45/67] iotests/208: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 46/67] iotests/216: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 47/67] iotests/218: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 48/67] iotests/219: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 49/67] iotests/222: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 50/67] iotests/224: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 51/67] iotests/228: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 52/67] iotests/234: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 53/67] iotests/235: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 54/67] iotests/236: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 55/67] iotests/237: Honor $IMGOPTS,
Max Reitz <=
- [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, 2019/10/01