From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 31/35] iotests: Filter actual image size in 184 and 191
Date: Thu, 26 Oct 2017 15:17:37 +0200 [thread overview]
Message-ID: <20171026131741.5059-32-kwolf@redhat.com> (raw)
In-Reply-To: <20171026131741.5059-1-kwolf@redhat.com>
From: Max Reitz <mreitz@redhat.com>
Whenever the actual image size is not part of the test, it should be
filtered as it depends on the host filesystem.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20171009163456.485-3-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/184 | 3 ++-
tests/qemu-iotests/184.out | 6 +++---
tests/qemu-iotests/191 | 4 ++--
tests/qemu-iotests/191.out | 46 +++++++++++++++++++++++-----------------------
4 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184
index 704f38f936..ee96c99af3 100755
--- a/tests/qemu-iotests/184
+++ b/tests/qemu-iotests/184
@@ -51,7 +51,8 @@ function do_run_qemu()
function run_qemu()
{
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp\
- | _filter_qemu_io | _filter_generated_node_ids
+ | _filter_qemu_io | _filter_generated_node_ids \
+ | _filter_actual_image_size
}
_make_test_img 64M
diff --git a/tests/qemu-iotests/184.out b/tests/qemu-iotests/184.out
index 0aed1a2220..4dc7984a85 100644
--- a/tests/qemu-iotests/184.out
+++ b/tests/qemu-iotests/184.out
@@ -32,7 +32,7 @@ Testing:
"filename": "json:{\"throttle-group\": \"group0\", \"driver\": \"throttle\", \"file\": {\"driver\": \"qcow2\", \"file\": {\"driver\": \"file\", \"filename\": \"TEST_DIR/t.qcow2\"}}}",
"cluster-size": 65536,
"format": "throttle",
- "actual-size": 200704,
+ "actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
@@ -62,7 +62,7 @@ Testing:
"filename": "TEST_DIR/t.qcow2",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 200704,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -100,7 +100,7 @@ Testing:
"virtual-size": 197120,
"filename": "TEST_DIR/t.qcow2",
"format": "file",
- "actual-size": 200704,
+ "actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index 28bdea8f98..ad785e10b1 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -92,7 +92,7 @@ echo === Check that both top and top2 point to base now ===
echo
_send_qemu_cmd $h "{ 'execute': 'query-named-block-nodes' }" "^}" |
- _filter_generated_node_ids
+ _filter_generated_node_ids | _filter_actual_image_size
_send_qemu_cmd $h "{ 'execute': 'quit' }" "^}"
wait=1 _cleanup_qemu
@@ -140,7 +140,7 @@ echo === Check that both top and top2 point to base now ===
echo
_send_qemu_cmd $h "{ 'execute': 'query-named-block-nodes' }" "^}" |
- _filter_generated_node_ids
+ _filter_generated_node_ids | _filter_actual_image_size
_send_qemu_cmd $h "{ 'execute': 'quit' }" "^}"
wait=1 _cleanup_qemu
diff --git a/tests/qemu-iotests/191.out b/tests/qemu-iotests/191.out
index 6157fa520f..73c0ed454c 100644
--- a/tests/qemu-iotests/191.out
+++ b/tests/qemu-iotests/191.out
@@ -47,7 +47,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.base",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 397312,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -64,7 +64,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.ovl2",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 200704,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -105,7 +105,7 @@ wrote 65536/65536 bytes at offset 1048576
"virtual-size": 197120,
"filename": "TEST_DIR/t.qcow2.ovl2",
"format": "file",
- "actual-size": 200704,
+ "actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
@@ -136,7 +136,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.base",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 397312,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -153,7 +153,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 200704,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -194,7 +194,7 @@ wrote 65536/65536 bytes at offset 1048576
"virtual-size": 197120,
"filename": "TEST_DIR/t.qcow2",
"format": "file",
- "actual-size": 200704,
+ "actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
@@ -225,7 +225,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.base",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 397312,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -242,7 +242,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.mid",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 397312,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -283,7 +283,7 @@ wrote 65536/65536 bytes at offset 1048576
"virtual-size": 393216,
"filename": "TEST_DIR/t.qcow2.mid",
"format": "file",
- "actual-size": 397312,
+ "actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
@@ -313,7 +313,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.base",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 397312,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -351,7 +351,7 @@ wrote 65536/65536 bytes at offset 1048576
"virtual-size": 393216,
"filename": "TEST_DIR/t.qcow2.base",
"format": "file",
- "actual-size": 397312,
+ "actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
@@ -450,7 +450,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.base",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 397312,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -467,7 +467,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.ovl2",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 200704,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -508,7 +508,7 @@ wrote 65536/65536 bytes at offset 1048576
"virtual-size": 197120,
"filename": "TEST_DIR/t.qcow2.ovl2",
"format": "file",
- "actual-size": 200704,
+ "actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
@@ -540,7 +540,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.base",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 397312,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -557,7 +557,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.ovl2",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 200704,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -576,7 +576,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.ovl3",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 200704,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -617,7 +617,7 @@ wrote 65536/65536 bytes at offset 1048576
"virtual-size": 197120,
"filename": "TEST_DIR/t.qcow2.ovl3",
"format": "file",
- "actual-size": 200704,
+ "actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
@@ -647,7 +647,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.base",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 397312,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -685,7 +685,7 @@ wrote 65536/65536 bytes at offset 1048576
"virtual-size": 393216,
"filename": "TEST_DIR/t.qcow2.base",
"format": "file",
- "actual-size": 397312,
+ "actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
@@ -716,7 +716,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2.base",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 397312,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -733,7 +733,7 @@ wrote 65536/65536 bytes at offset 1048576
"filename": "TEST_DIR/t.qcow2",
"cluster-size": 65536,
"format": "qcow2",
- "actual-size": 200704,
+ "actual-size": SIZE,
"format-specific": {
"type": "qcow2",
"data": {
@@ -774,7 +774,7 @@ wrote 65536/65536 bytes at offset 1048576
"virtual-size": 197120,
"filename": "TEST_DIR/t.qcow2",
"format": "file",
- "actual-size": 200704,
+ "actual-size": SIZE,
"dirty-flag": false
},
"iops_wr": 0,
--
2.13.6
next prev parent reply other threads:[~2017-10-26 13:19 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 13:17 [Qemu-devel] [PULL 00/35] Block layer patches Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 01/35] block: don't add 'driver' to options when referring to backing via node name Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 02/35] qemu-iotests: Test backing_fmt with backing node reference Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 03/35] block: Allow NULL file for bdrv_get_block_status() Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 04/35] block: Add flag to avoid wasted work in bdrv_is_allocated() Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 05/35] block: Make bdrv_round_to_clusters() signature more useful Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 06/35] qcow2: Switch is_zero_sectors() to byte-based Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 07/35] block: Switch bdrv_make_zero() " Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 08/35] qemu-img: Switch get_block_status() " Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 09/35] block: Convert bdrv_get_block_status() to bytes Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 10/35] block: Switch bdrv_co_get_block_status() to byte-based Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 11/35] block: Switch BdrvCoGetBlockStatusData " Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 12/35] block: Switch bdrv_common_block_status_above() " Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 13/35] block: Switch bdrv_co_get_block_status_above() " Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 14/35] block: Convert bdrv_get_block_status_above() to bytes Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 15/35] qemu-img: Simplify logic in img_compare() Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 16/35] qemu-img: Speed up compare on pre-allocated larger file Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 17/35] qemu-img: Add find_nonzero() Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 18/35] qemu-img: Drop redundant error message in compare Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 19/35] qemu-img: Change check_empty_sectors() to byte-based Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 20/35] qemu-img: Change compare_sectors() to be byte-based Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 21/35] qemu-img: Change img_rebase() " Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 22/35] qemu-img: Change img_compare() " Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 23/35] block: Align block status requests Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 24/35] block: Reduce bdrv_aligned_preadv() rounding Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 25/35] qcow2: Reduce is_zero() rounding Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 26/35] qemu-io: Relax 'alloc' now that block-status doesn't assert Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 27/35] qemu-img.1: Image invalidation on qemu-img commit Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 28/35] qcow2: Use BDRV_SECTOR_BITS instead of its literal value Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 29/35] iotests: Add test for dataplane mirroring Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 30/35] iotests: Pull _filter_actual_image_size from 67/87 Kevin Wolf
2017-10-26 13:17 ` Kevin Wolf [this message]
2017-10-26 13:17 ` [Qemu-devel] [PULL 32/35] qcow2: Emit errp when truncating the image tail Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 33/35] qcow2: Fix unaligned preallocated truncation Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 34/35] qcow2: Always execute preallocate() in a coroutine Kevin Wolf
2017-10-26 13:17 ` [Qemu-devel] [PULL 35/35] iotests: Add cluster_size=64k to 125 Kevin Wolf
2017-10-27 10:13 ` [Qemu-devel] [PULL 00/35] Block layer patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171026131741.5059-32-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).