diff mbox series

fixup! iotests: Specify explicit backing format where sensible

Message ID 20200713114031.137846-1-eblake@redhat.com
State New
Headers show
Series fixup! iotests: Specify explicit backing format where sensible | expand

Commit Message

Eric Blake July 13, 2020, 11:40 a.m. UTC 
Max spotted that I didn't test -qed...

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 tests/qemu-iotests/024     | 2 +-
 tests/qemu-iotests/024.out | 1 -
 tests/qemu-iotests/043     | 5 +++--
 tests/qemu-iotests/043.out | 4 ----
 4 files changed, 4 insertions(+), 8 deletions(-)

Comments

Kevin Wolf July 13, 2020, 12:50 p.m. UTC | #1 
Am 13.07.2020 um 13:40 hat Eric Blake geschrieben:
> Max spotted that I didn't test -qed...
> 
> Signed-off-by: Eric Blake <eblake@redhat.com>

I guess I have a new name now... :-)

Kevin^WMax
Eric Blake July 13, 2020, 1:44 p.m. UTC | #2 
On 7/13/20 7:50 AM, Kevin 'Max' Wolf wrote:
> Am 13.07.2020 um 13:40 hat Eric Blake geschrieben:
>> Max spotted that I didn't test -qed...
>>
>> Signed-off-by: Eric Blake <eblake@redhat.com>
> 
> I guess I have a new name now... :-)

Sorry, too many replies on the thread, and I messed up on which one I 
was reading!

> 
> Kevin^WMax

Brown Paper Bag^W^W^WEric
diff mbox series

Patch

diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
index 3c5d57310e94..12aceb2d41f6 100755
--- a/tests/qemu-iotests/024
+++ b/tests/qemu-iotests/024
@@ -180,7 +180,7 @@  $QEMU_IMG rebase -f "$IMGFMT" -b "$BASE_NEW_OREL" -F $IMGFMT "$OVERLAY_WREL"
 popd >/dev/null

 # Verify the backing path is correct
-TEST_IMG=$OVERLAY _img_info | grep '^backing file'
+TEST_IMG=$OVERLAY _img_info | grep '^backing file:'

 echo

diff --git a/tests/qemu-iotests/024.out b/tests/qemu-iotests/024.out
index f4fd77fd5b4d..973a5a371119 100644
--- a/tests/qemu-iotests/024.out
+++ b/tests/qemu-iotests/024.out
@@ -158,7 +158,6 @@  wrote 65536/65536 bytes at offset 196608
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 backing file: t.IMGFMT.base_new (actual path: TEST_DIR/subdir/t.IMGFMT.base_new)
-backing file format: IMGFMT

 read 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index e4022b7044de..3271737f69cc 100755
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@@ -82,11 +82,12 @@  _make_test_img -b "$TEST_IMG.2.base" -F $IMGFMT $size

 echo
 echo "== finite chain of length 3 (human) =="
-_img_info --backing-chain
+# Exclude backing format, since qed differs from qcow2 on what gets stored
+_img_info --backing-chain | grep -v '^backing file format:'

 echo
 echo "== finite chain of length 3 (json) =="
-_img_info --backing-chain --output=json
+_img_info --backing-chain --output=json | grep -v 'backing-filename-format'

 # success, all done
 echo "*** done"
diff --git a/tests/qemu-iotests/043.out b/tests/qemu-iotests/043.out
index 7251e26d4ff9..63ecb2181690 100644
--- a/tests/qemu-iotests/043.out
+++ b/tests/qemu-iotests/043.out
@@ -25,14 +25,12 @@  file format: IMGFMT
 virtual size: 128 MiB (134217728 bytes)
 cluster_size: 65536
 backing file: TEST_DIR/t.IMGFMT.2.base
-backing file format: IMGFMT

 image: TEST_DIR/t.IMGFMT.2.base
 file format: IMGFMT
 virtual size: 128 MiB (134217728 bytes)
 cluster_size: 65536
 backing file: TEST_DIR/t.IMGFMT.1.base
-backing file format: IMGFMT

 image: TEST_DIR/t.IMGFMT.1.base
 file format: IMGFMT
@@ -42,7 +40,6 @@  cluster_size: 65536
 == finite chain of length 3 (json) ==
 [
     {
-        "backing-filename-format": "IMGFMT",
         "virtual-size": 134217728,
         "filename": "TEST_DIR/t.IMGFMT",
         "cluster-size": 65536,
@@ -52,7 +49,6 @@  cluster_size: 65536
         "dirty-flag": false
     },
     {
-        "backing-filename-format": "IMGFMT",
         "virtual-size": 134217728,
         "filename": "TEST_DIR/t.IMGFMT.2.base",
         "cluster-size": 65536,