[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/34] iotests: Make 198 work with data_file
From: |
Max Reitz |
Subject: |
[PULL 27/34] iotests: Make 198 work with data_file |
Date: |
Mon, 6 Jan 2020 15:41:59 +0100 |
We do not care about the json:{} filenames here, so we can just filter
them out and thus make the test work both with and without external data
files.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Maxim Levitsky <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/198 | 6 ++++--
tests/qemu-iotests/198.out | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
index c8f824cfae..fb0d5a29d3 100755
--- a/tests/qemu-iotests/198
+++ b/tests/qemu-iotests/198
@@ -92,13 +92,15 @@ echo
echo "== checking image base =="
$QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \
| sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
- -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
+ -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
+ | _filter_json_filename
echo
echo "== checking image layer =="
$QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific
\
| sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
- -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
+ -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
+ | _filter_json_filename
# success, all done
diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
index e86b175e39..831ce3a289 100644
--- a/tests/qemu-iotests/198.out
+++ b/tests/qemu-iotests/198.out
@@ -32,7 +32,7 @@ read 16777216/16777216 bytes at offset 0
16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== checking image base ==
-image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file":
{"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
+image: json:{ /* filtered */ }
file format: IMGFMT
virtual size: 16 MiB (16777216 bytes)
Format specific information:
@@ -74,7 +74,7 @@ Format specific information:
master key iters: 1024
== checking image layer ==
-image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file":
{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
+image: json:{ /* filtered */ }
file format: IMGFMT
virtual size: 16 MiB (16777216 bytes)
backing file: TEST_DIR/t.IMGFMT.base
--
2.24.1
- [PULL 17/34] iotests: Inject space into -ocompat=0.10 in 051, (continued)
- [PULL 17/34] iotests: Inject space into -ocompat=0.10 in 051, Max Reitz, 2020/01/06
- [PULL 20/34] iotests: Drop IMGOPTS use in 267, Max Reitz, 2020/01/06
- [PULL 18/34] iotests: Replace IMGOPTS= by -o, Max Reitz, 2020/01/06
- [PULL 19/34] iotests: Replace IMGOPTS='' by --no-opts, Max Reitz, 2020/01/06
- [PULL 21/34] iotests: Avoid qemu-img create, Max Reitz, 2020/01/06
- [PULL 22/34] iotests: Use _rm_test_img for deleting test images, Max Reitz, 2020/01/06
- [PULL 23/34] iotests: Avoid cp/mv of test images, Max Reitz, 2020/01/06
- [PULL 24/34] iotests: Make 091 work with data_file, Max Reitz, 2020/01/06
- [PULL 25/34] iotests: Make 110 work with data_file, Max Reitz, 2020/01/06
- [PULL 26/34] iotests: Make 137 work with data_file, Max Reitz, 2020/01/06
- [PULL 27/34] iotests: Make 198 work with data_file,
Max Reitz <=
- [PULL 28/34] iotests: Disable data_file where it cannot be used, Max Reitz, 2020/01/06
- [PULL 29/34] iotests: Allow check -o data_file, Max Reitz, 2020/01/06
- [PULL 30/34] block: introduce compress filter driver, Max Reitz, 2020/01/06
- [PULL 31/34] qcow2: Allow writing compressed data of multiple clusters, Max Reitz, 2020/01/06
- [PULL 32/34] tests/qemu-iotests: add case to write compressed data of multiple clusters, Max Reitz, 2020/01/06
- [PULL 33/34] tests/qemu-iotests: Update tests to recent desugarized -accel option, Max Reitz, 2020/01/06
- [PULL 34/34] backup-top: Begin drain earlier, Max Reitz, 2020/01/06
- Re: [PULL 00/34] Block patches, Peter Maydell, 2020/01/06