218e99
From 8e9c1ae6f17f51f05a6e0cf5aacf8bbd7341eee4 Mon Sep 17 00:00:00 2001
218e99
From: Max Reitz <mreitz@redhat.com>
218e99
Date: Fri, 13 Sep 2013 10:37:12 +0200
218e99
Subject: [PATCH 37/38] qemu-iotests: Fix test 038
218e99
218e99
Message-id: <1379499002-5231-6-git-send-email-mreitz@redhat.com>
218e99
Patchwork-id: 54436
218e99
O-Subject: [RHEL-7.0 qemu-kvm PATCH 5/6] qemu-iotests: Fix test 038
218e99
Bugzilla: 1006959
218e99
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
218e99
RH-Acked-by: Fam Zheng <famz@redhat.com>
218e99
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
218e99
218e99
BZ: 1006959
218e99
218e99
Test 038 uses asynchronous I/O, resulting (potentially) in a different
218e99
output for every run (regarding the order of the I/O accesses). This can
218e99
be fixed by simply sorting the I/O access messages, since their order is
218e99
irrelevant anyway (for this asynchonous I/O).
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
(cherry picked from commit c21bddf27fd8029890e9fc2ee314788919eababf)
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
---
218e99
 tests/qemu-iotests/038     |    3 ++-
218e99
 tests/qemu-iotests/038.out |   10 +++++-----
218e99
 2 files changed, 7 insertions(+), 6 deletions(-)
218e99
218e99
diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038
218e99
index 36125ea..90de1a7 100755
218e99
--- a/tests/qemu-iotests/038
218e99
+++ b/tests/qemu-iotests/038
218e99
@@ -95,7 +95,8 @@ function overlay_io()
218e99
 }
218e99
 
218e99
 overlay_io | $QEMU_IO $TEST_IMG | _filter_qemu_io |\
218e99
-	sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g'
218e99
+    sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g' \
218e99
+    -e 's/qemu-io> //g' | paste - - | sort | tr '\t' '\n'
218e99
 
218e99
 echo
218e99
 echo "== Verify image content =="
218e99
diff --git a/tests/qemu-iotests/038.out b/tests/qemu-iotests/038.out
218e99
index 9cd0cd8..96c2f84 100644
218e99
--- a/tests/qemu-iotests/038.out
218e99
+++ b/tests/qemu-iotests/038.out
218e99
@@ -517,7 +517,7 @@ qemu-io> wrote 65536/65536 bytes at offset 16711680
218e99
 qemu-io> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file='TEST_DIR/t.IMGFMT.base' 
218e99
 
218e99
 == Some concurrent requests touching the same cluster ==
218e99
-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
218e99
+wrote 65536/65536 bytes at offset XXX
218e99
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
 wrote 65536/65536 bytes at offset XXX
218e99
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
@@ -577,8 +577,6 @@ wrote 65536/65536 bytes at offset XXX
218e99
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
 wrote 65536/65536 bytes at offset XXX
218e99
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
-wrote 81920/81920 bytes at offset XXX
218e99
-80 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
 wrote 65536/65536 bytes at offset XXX
218e99
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
 wrote 65536/65536 bytes at offset XXX
218e99
@@ -645,8 +643,6 @@ wrote 65536/65536 bytes at offset XXX
218e99
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
 wrote 65536/65536 bytes at offset XXX
218e99
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
-wrote 81920/81920 bytes at offset XXX
218e99
-80 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
 wrote 65536/65536 bytes at offset XXX
218e99
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
 wrote 65536/65536 bytes at offset XXX
218e99
@@ -705,6 +701,10 @@ wrote 65536/65536 bytes at offset XXX
218e99
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
 wrote 65536/65536 bytes at offset XXX
218e99
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
+wrote 81920/81920 bytes at offset XXX
218e99
+80 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
+wrote 81920/81920 bytes at offset XXX
218e99
+80 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
218e99
 
218e99
 == Verify image content ==
218e99
 qemu-io> read 4096/4096 bytes at offset 2064384
218e99
-- 
218e99
1.7.1
218e99