Commit b66df843 authored by Max Reitz's avatar Max Reitz
Browse files

iotests: Filter actual image size in 184 and 191 



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: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20171009163456.485-3-mreitz@redhat.com
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 44673a0b

tests/qemu-iotests/184

+2 −1
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/184.out

+3 −3
Original line number Diff line number Diff line
@@ -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,

tests/qemu-iotests/191

+2 −2
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/191.out

+23 −23
Original line number Diff line number Diff line
@@ -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,