[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/6] iotests: Enhance 223 to cover qemu-img map improvements
From: |
Eric Blake |
Subject: |
[PULL 6/6] iotests: Enhance 223 to cover qemu-img map improvements |
Date: |
Mon, 18 May 2020 11:32:18 -0500 |
Since qemu-img map + x-dirty-bitmap remains the easiest way to read
persistent bitmaps at the moment, it makes a reasonable place to add
coverage to ensure we do not regress on the just-added parameters to
qemu-img map.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
tests/qemu-iotests/223 | 6 ++++--
tests/qemu-iotests/223.out | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223
index 56fbc5fb09a0..d68bc3cb6f1a 100755
--- a/tests/qemu-iotests/223
+++ b/tests/qemu-iotests/223
@@ -2,7 +2,7 @@
#
# Test reading dirty bitmap over NBD
#
-# Copyright (C) 2018-2019 Red Hat, Inc.
+# Copyright (C) 2018-2020 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -206,7 +206,9 @@ $QEMU_IMG map --output=json --image-opts \
nbd_server_start_unix_socket -f $IMGFMT -B b2 "$TEST_IMG"
IMG="driver=nbd,server.type=unix,server.path=$nbd_unix_socket"
-$QEMU_IMG map --output=json --image-opts \
+$QEMU_IMG map --output=json --image-opts --max-length=12345 \
+ "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map
+$QEMU_IMG map --output=json --image-opts --start-offset=12345 \
"$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map
# success, all done
diff --git a/tests/qemu-iotests/223.out b/tests/qemu-iotests/223.out
index 80c0cf65095b..e1eaaedb55b3 100644
--- a/tests/qemu-iotests/223.out
+++ b/tests/qemu-iotests/223.out
@@ -201,6 +201,7 @@ read 2097152/2097152 bytes at offset 2097152
{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data":
false}]
[{ "start": 0, "length": 512, "depth": 0, "zero": false, "data": true,
"offset": OFFSET},
{ "start": 512, "length": 512, "depth": 0, "zero": false, "data": false},
-{ "start": 1024, "length": 2096128, "depth": 0, "zero": false, "data": true,
"offset": OFFSET},
+{ "start": 1024, "length": 11321, "depth": 0, "zero": false, "data": true,
"offset": OFFSET}]
+[{ "start": 12345, "length": 2084807, "depth": 0, "zero": false, "data": true,
"offset": OFFSET},
{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data":
false}]
*** done
--
2.26.2
- [PULL 0/6] NBD patches for 2020-05-18, Eric Blake, 2020/05/18
- [PULL 4/6] qemu-img: refactor dump_map_entry JSON format output, Eric Blake, 2020/05/18
- [PULL 5/6] qemu-img: Add --start-offset and --max-length to map, Eric Blake, 2020/05/18
- [PULL 6/6] iotests: Enhance 223 to cover qemu-img map improvements,
Eric Blake <=
- [PULL 1/6] qemu-nbd: Close inherited stderr, Eric Blake, 2020/05/18
- [PULL 3/6] qemu-img: validate image length in img_map, Eric Blake, 2020/05/18
- [PULL 2/6] qemu_img: add cvtnum_full to print error reports, Eric Blake, 2020/05/18
- Re: [PULL 0/6] NBD patches for 2020-05-18, Eric Blake, 2020/05/18
- Re: [PULL 0/6] NBD patches for 2020-05-18, Peter Maydell, 2020/05/19