* [Qemu-devel] [PATCH 0/2] iotests: Add _filter_actual_image_size
@ 2017-10-09 16:34 Max Reitz
2017-10-09 16:34 ` [Qemu-devel] [PATCH 1/2] iotests: Pull _filter_actual_image_size from 67/87 Max Reitz
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Max Reitz @ 2017-10-09 16:34 UTC (permalink / raw)
To: qemu-block; +Cc: qemu-devel, Max Reitz, Kevin Wolf
The actual size of an image depends on the host filesystem. Therefore,
it should be filtered from the test output if it's not part of the test
itself (and if it is, the test should take extra care, like 106 does).
So let's put the filtering sed line from 067 and 087 into a common
filter function and use it in 184 and 191.
Max Reitz (2):
iotests: Pull _filter_actual_image_size from 67/87
iotests: Filter actual image size in 184 and 191
tests/qemu-iotests/067 | 2 +-
tests/qemu-iotests/087 | 2 +-
tests/qemu-iotests/184 | 3 ++-
tests/qemu-iotests/184.out | 6 +++---
tests/qemu-iotests/191 | 4 ++--
tests/qemu-iotests/191.out | 46 ++++++++++++++++++++--------------------
tests/qemu-iotests/common.filter | 6 ++++++
7 files changed, 38 insertions(+), 31 deletions(-)
--
2.13.6
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 1/2] iotests: Pull _filter_actual_image_size from 67/87
2017-10-09 16:34 [Qemu-devel] [PATCH 0/2] iotests: Add _filter_actual_image_size Max Reitz
@ 2017-10-09 16:34 ` Max Reitz
2017-10-09 18:01 ` [Qemu-devel] [Qemu-block] " Jeff Cody
2017-10-09 16:34 ` [Qemu-devel] [PATCH 2/2] iotests: Filter actual image size in 184 and 191 Max Reitz
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Max Reitz @ 2017-10-09 16:34 UTC (permalink / raw)
To: qemu-block; +Cc: qemu-devel, Max Reitz, Kevin Wolf
Tests 067 and 087 filter the actual image size because it depends on the
host filesystem (and is not part of the respective test). Since this is
generally true, we should have a common filter function for this, so
let's pull out the sed line from both tests into such a function.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/067 | 2 +-
tests/qemu-iotests/087 | 2 +-
tests/qemu-iotests/common.filter | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index ee9595f0da..9d561ef786 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -56,7 +56,7 @@ _filter_qmp_events()
function run_qemu()
{
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \
- | sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' \
+ | _filter_actual_image_size \
| _filter_generated_node_ids | _filter_qmp_events
}
diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087
index f8e4903f4f..27ab6c5151 100755
--- a/tests/qemu-iotests/087
+++ b/tests/qemu-iotests/087
@@ -46,7 +46,7 @@ function run_qemu()
{
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp \
| _filter_qemu | _filter_imgfmt \
- | sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g'
+ | _filter_actual_image_size
}
size=128M
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index 227b37e941..873ca6b104 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -105,6 +105,12 @@ _filter_block_job_len()
sed -e 's/, "len": [0-9]\+,/, "len": LEN,/g'
}
+# replace actual image size (depends on the host filesystem)
+_filter_actual_image_size()
+{
+ sed -s 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g'
+}
+
# replace driver-specific options in the "Formatting..." line
_filter_img_create()
{
--
2.13.6
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 2/2] iotests: Filter actual image size in 184 and 191
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 16:34 ` Max Reitz
2017-10-09 18:02 ` [Qemu-devel] [Qemu-block] " 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
3 siblings, 1 reply; 7+ messages in thread
From: Max Reitz @ 2017-10-09 16:34 UTC (permalink / raw)
To: qemu-block; +Cc: qemu-devel, Max Reitz, Kevin Wolf
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 0/2] iotests: Add _filter_actual_image_size
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 16:34 ` [Qemu-devel] [PATCH 2/2] iotests: Filter actual image size in 184 and 191 Max Reitz
@ 2017-10-09 17:53 ` Eric Blake
2017-10-09 19:55 ` Max Reitz
3 siblings, 0 replies; 7+ messages in thread
From: Eric Blake @ 2017-10-09 17:53 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
On 10/09/2017 11:34 AM, Max Reitz wrote:
> The actual size of an image depends on the host filesystem. Therefore,
> it should be filtered from the test output if it's not part of the test
> itself (and if it is, the test should take extra care, like 106 does).
>
> So let's put the filtering sed line from 067 and 087 into a common
> filter function and use it in 184 and 191.
>
>
> Max Reitz (2):
> iotests: Pull _filter_actual_image_size from 67/87
> iotests: Filter actual image size in 184 and 191
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH 1/2] iotests: Pull _filter_actual_image_size from 67/87
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 ` Jeff Cody
0 siblings, 0 replies; 7+ messages in thread
From: Jeff Cody @ 2017-10-09 18:01 UTC (permalink / raw)
To: Max Reitz; +Cc: qemu-block, Kevin Wolf, qemu-devel
On Mon, Oct 09, 2017 at 06:34:55PM +0200, Max Reitz wrote:
> Tests 067 and 087 filter the actual image size because it depends on the
> host filesystem (and is not part of the respective test). Since this is
> generally true, we should have a common filter function for this, so
> let's pull out the sed line from both tests into such a function.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
> ---
> tests/qemu-iotests/067 | 2 +-
> tests/qemu-iotests/087 | 2 +-
> tests/qemu-iotests/common.filter | 6 ++++++
> 3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
> index ee9595f0da..9d561ef786 100755
> --- a/tests/qemu-iotests/067
> +++ b/tests/qemu-iotests/067
> @@ -56,7 +56,7 @@ _filter_qmp_events()
> function run_qemu()
> {
> do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \
> - | sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' \
> + | _filter_actual_image_size \
> | _filter_generated_node_ids | _filter_qmp_events
> }
>
> diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087
> index f8e4903f4f..27ab6c5151 100755
> --- a/tests/qemu-iotests/087
> +++ b/tests/qemu-iotests/087
> @@ -46,7 +46,7 @@ function run_qemu()
> {
> do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp \
> | _filter_qemu | _filter_imgfmt \
> - | sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g'
> + | _filter_actual_image_size
> }
>
> size=128M
> diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
> index 227b37e941..873ca6b104 100644
> --- a/tests/qemu-iotests/common.filter
> +++ b/tests/qemu-iotests/common.filter
> @@ -105,6 +105,12 @@ _filter_block_job_len()
> sed -e 's/, "len": [0-9]\+,/, "len": LEN,/g'
> }
>
> +# replace actual image size (depends on the host filesystem)
> +_filter_actual_image_size()
> +{
> + sed -s 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g'
> +}
> +
> # replace driver-specific options in the "Formatting..." line
> _filter_img_create()
> {
> --
> 2.13.6
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] iotests: Filter actual image size in 184 and 191
2017-10-09 16:34 ` [Qemu-devel] [PATCH 2/2] iotests: Filter actual image size in 184 and 191 Max Reitz
@ 2017-10-09 18:02 ` Jeff Cody
0 siblings, 0 replies; 7+ messages in thread
From: Jeff Cody @ 2017-10-09 18:02 UTC (permalink / raw)
To: Max Reitz; +Cc: qemu-block, Kevin Wolf, qemu-devel
On Mon, Oct 09, 2017 at 06:34:56PM +0200, Max Reitz wrote:
> 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>
Reviewed-by: Jeff Cody <jcody@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
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 0/2] iotests: Add _filter_actual_image_size
2017-10-09 16:34 [Qemu-devel] [PATCH 0/2] iotests: Add _filter_actual_image_size Max Reitz
` (2 preceding siblings ...)
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
3 siblings, 0 replies; 7+ messages in thread
From: Max Reitz @ 2017-10-09 19:55 UTC (permalink / raw)
To: qemu-block; +Cc: qemu-devel, Kevin Wolf
[-- Attachment #1: Type: text/plain, Size: 496 bytes --]
On 2017-10-09 18:34, Max Reitz wrote:
> The actual size of an image depends on the host filesystem. Therefore,
> it should be filtered from the test output if it's not part of the test
> itself (and if it is, the test should take extra care, like 106 does).
>
> So let's put the filtering sed line from 067 and 087 into a common
> filter function and use it in 184 and 191.
Thanks for the reviews, applied to my block branch:
https://github.com/XanClic/qemu/commits/block
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 512 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-10-09 19:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [Qemu-devel] [PATCH 2/2] iotests: Filter actual image size in 184 and 191 Max Reitz
2017-10-09 18:02 ` [Qemu-devel] [Qemu-block] " 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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.