cryptospore / rpms / qemu-kvm

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