[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 50/67] iotests/224: Honor $IMGOPTS
From: |
Max Reitz |
Subject: |
[PATCH 50/67] iotests/224: Honor $IMGOPTS |
Date: |
Tue, 1 Oct 2019 21:46:58 +0200 |
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/224 | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/tests/qemu-iotests/224 b/tests/qemu-iotests/224
index e227d3ab3c..e9f5729c33 100755
--- a/tests/qemu-iotests/224
+++ b/tests/qemu-iotests/224
@@ -21,8 +21,9 @@
# Creator/Owner: Max Reitz <address@hidden>
import iotests
-from iotests import log, qemu_img, qemu_io_silent, filter_qmp_testfiles, \
- filter_qmp_imgfmt, filter_json_filename
+from iotests import log, create_test_image, qemu_io_silent, \
+ filter_qmp_testfiles, filter_qmp_imgfmt, \
+ filter_json_filename
import json
import re
@@ -47,17 +48,14 @@ for filter_node_name in False, True:
log('--- filter_node_name: %s ---' % filter_node_name)
log('')
- with iotests.FilePath('base.img') as base_img_path, \
- iotests.FilePath('mid.img') as mid_img_path, \
- iotests.FilePath('top.img') as top_img_path, \
+ with iotests.ImagePath('base.img') as base_img_path, \
+ iotests.ImagePath('mid.img') as mid_img_path, \
+ iotests.ImagePath('top.img') as top_img_path, \
iotests.VM() as vm:
- assert qemu_img('create', '-f', iotests.imgfmt,
- base_img_path, '64M') == 0
- assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path,
- mid_img_path) == 0
- assert qemu_img('create', '-f', iotests.imgfmt, '-b', mid_img_path,
- top_img_path) == 0
+ assert create_test_image(base_img_path, '64M') == 0
+ assert create_test_image(mid_img_path, backing_file=base_img_path) == 0
+ assert create_test_image(top_img_path, backing_file=mid_img_path) == 0
# Something to commit
assert qemu_io_silent(mid_img_path, '-c', 'write -P 1 0 1M') == 0
--
2.21.0
- [PATCH 41/67] iotests/202: Honor $IMGOPTS, (continued)
- [PATCH 41/67] iotests/202: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 42/67] iotests/203: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 43/67] iotests/205: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 44/67] iotests/208: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [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 51/67] iotests/228: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 50/67] iotests/224: Honor $IMGOPTS,
Max Reitz <=
- [PATCH 52/67] iotests/234: 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, 2019/10/01
- [PATCH 53/67] iotests/235: 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 60/67] iotests/254: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 59/67] iotests/248: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 61/67] iotests/255: Honor $IMGOPTS, Max Reitz, 2019/10/01
- [PATCH 58/67] iotests/246: Honor $IMGOPTS, Max Reitz, 2019/10/01