[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 56/67] iotests/242: Honor $IMGOPTS
From: |
Max Reitz |
Subject: |
[PATCH 56/67] iotests/242: Honor $IMGOPTS |
Date: |
Tue, 1 Oct 2019 21:47:04 +0200 |
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/242 | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242
index 333fb8b56c..bccd8a9fdf 100755
--- a/tests/qemu-iotests/242
+++ b/tests/qemu-iotests/242
@@ -21,14 +21,14 @@
import iotests
import json
import struct
-from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \
- file_path, img_info_log, log, filter_qemu_io
+from iotests import create_test_image, remove_test_image, qemu_io, \
+ qemu_img_pipe, image_path, img_info_log, log, filter_qemu_io
iotests.script_initialize(supported_fmts=['qcow2'],
# compat=1.1 is needed for dirty bitmaps
unsupported_imgopts=['compat=0.10'])
-disk = file_path('disk')
+disk = image_path('disk')
chunk = 256 * 1024
bitmap_flag_unknown = 1 << 2
# flag_offset = 5*cluster_size + flag_offset_in_bitmap_directory_entry
@@ -74,7 +74,7 @@ def toggle_flag(offset):
f.write(struct.pack("B", toggled))
-qemu_img_create('-f', iotests.imgfmt, disk, '1M')
+create_test_image(disk, '1M')
for num in range(1, 4):
disabled = False
@@ -95,7 +95,8 @@ vm.shutdown()
num += 1
log('\nTest {}'.format(num))
-qemu_img_create('-f', iotests.imgfmt, disk, '1M')
+remove_test_image(disk)
+create_test_image(disk, '1M')
add_bitmap(1, True, False)
log('Write an unknown bitmap flag \'{}\' into a new QCOW2 image at offset {}'
.format(hex(bitmap_flag_unknown), flag_offset))
--
2.21.0
- [PATCH 46/67] iotests/216: Honor $IMGOPTS, (continued)
- [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, 2019/10/01
- [PATCH 56/67] iotests/242: Honor $IMGOPTS,
Max Reitz <=
- [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
- [PATCH 66/67] iotests.py: Forbid qemu_img*('create', ...), Max Reitz, 2019/10/01