Commit c21bddf2 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

qemu-iotests: Fix test 038 



Test 038 uses asynchronous I/O, resulting (potentially) in a different
output for every run (regarding the order of the I/O accesses). This can
be fixed by simply sorting the I/O access messages, since their order is
irrelevant anyway (for this asynchonous I/O).

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent aa3fe714

tests/qemu-iotests/038

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ function overlay_io() 
}



overlay_io | $QEMU_IO $TEST_IMG | _filter_qemu_io |\

	sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g'

    sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g' \

    -e 's/qemu-io> //g' | paste - - | sort | tr '\t' '\n'



echo

echo "== Verify image content =="

tests/qemu-iotests/038.out

+5 −5
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ qemu-io> wrote 65536/65536 bytes at offset 16711680 
qemu-io> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file='TEST_DIR/t.IMGFMT.base' 



== Some concurrent requests touching the same cluster ==

qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> wrote 65536/65536 bytes at offset XXX

wrote 65536/65536 bytes at offset XXX

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 65536/65536 bytes at offset XXX

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -577,8 +577,6 @@ wrote 65536/65536 bytes at offset XXX 
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 65536/65536 bytes at offset XXX

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 81920/81920 bytes at offset XXX

80 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 65536/65536 bytes at offset XXX

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 65536/65536 bytes at offset XXX
@@ -645,8 +643,6 @@ wrote 65536/65536 bytes at offset XXX 
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 65536/65536 bytes at offset XXX

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 81920/81920 bytes at offset XXX

80 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 65536/65536 bytes at offset XXX

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 65536/65536 bytes at offset XXX
@@ -705,6 +701,10 @@ wrote 65536/65536 bytes at offset XXX 
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 65536/65536 bytes at offset XXX

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 81920/81920 bytes at offset XXX

80 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

wrote 81920/81920 bytes at offset XXX

80 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)



== Verify image content ==

qemu-io> read 4096/4096 bytes at offset 2064384