From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
Kevin Wolf <kwolf@redhat.com>
Subject: [Qemu-devel] [PATCH 2/2] iotests: Filter actual image size in 184 and 191
Date: Mon, 9 Oct 2017 18:34:56 +0200 [thread overview]
Message-ID: <20171009163456.485-3-mreitz@redhat.com> (raw)
In-Reply-To: <20171009163456.485-1-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>
---
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 ac2b88fd78..9dbeadf899 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -91,7 +91,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
@@ -139,7 +139,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 7bfcd2d5d8..9133fc80f1 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-09 16:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 16:34 [Qemu-devel] [PATCH 0/2] iotests: Add _filter_actual_image_size Max Reitz
2017-10-09 16:34 ` [Qemu-devel] [PATCH 1/2] iotests: Pull _filter_actual_image_size from 67/87 Max Reitz
2017-10-09 18:01 ` [Qemu-devel] [Qemu-block] " Jeff Cody
2017-10-09 16:34 ` Max Reitz [this message]
2017-10-09 18:02 ` [Qemu-devel] [Qemu-block] [PATCH 2/2] iotests: Filter actual image size in 184 and 191 Jeff Cody
2017-10-09 17:53 ` [Qemu-devel] [PATCH 0/2] iotests: Add _filter_actual_image_size Eric Blake
2017-10-09 19:55 ` Max Reitz
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=20171009163456.485-3-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=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).