[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] iotests: Filter actual image s
|
From: |
Jeff Cody |
|
Subject: |
Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] iotests: Filter actual image size in 184 and 191 |
|
Date: |
Mon, 9 Oct 2017 14:02:05 -0400 |
|
User-agent: |
Mutt/1.5.24 (2015-08-30) |
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 <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
> ---
> 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
>
>