From 762c6ae0424c3389e432ea40d2559abac2eb3566 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Sun, 29 Dec 2013 22:06:57 +0100 Subject: [PATCH 6/8] qemu-iotests: Adjust test result 039 RH-Author: Max Reitz Message-id: <1388354817-3013-6-git-send-email-mreitz@redhat.com> Patchwork-id: 56447 O-Subject: [RHEL-7.0 qemu-kvm PATCH 5/5] qemu-iotests: Adjust test result 039 Bugzilla: 1004347 RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Fam Zheng RH-Acked-by: Kevin Wolf BZ: 1004347 The moved OFLAG_COPIED check in qcow2_check_refcounts results in a different output from test 039 (mismatches are now found after the general refcount check (as far as any remain)). This patch adjusts the expected test result accordingly. Signed-off-by: Max Reitz Signed-off-by: Stefan Hajnoczi (cherry picked from commit b3f3a30f387f34308b3e4d910a2824e69c34182f) Signed-off-by: Max Reitz --- tests/qemu-iotests/039.out | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Signed-off-by: Miroslav Rezanina --- tests/qemu-iotests/039.out | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out index cb510d6..077fa64 100644 --- a/tests/qemu-iotests/039.out +++ b/tests/qemu-iotests/039.out @@ -12,8 +12,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 wrote 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) incompatible_features 0x1 -ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0 ERROR cluster 5 refcount=0 reference=1 +ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0 2 errors were found on the image. Data may be corrupted, or further writes to the image may corrupt it. @@ -24,7 +24,6 @@ read 512/512 bytes at offset 0 incompatible_features 0x1 == Repairing the image file must succeed == -ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0 Repairing cluster 5 refcount=0 reference=1 The following inconsistencies were found and repaired: @@ -44,7 +43,6 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 wrote 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) incompatible_features 0x1 -ERROR OFLAG_COPIED: offset=8000000000050000 refcount=0 Repairing cluster 5 refcount=0 reference=1 wrote 512/512 bytes at offset 0 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -- 1.7.1