Blame SOURCES/kvm-qemu-iotests-Remaining-error-propagation-adjustments.patch

0a122b
From b1ee83f0ffaac613717792a9681b0f1f79fcc108 Mon Sep 17 00:00:00 2001
0a122b
From: Max Reitz <mreitz@redhat.com>
0a122b
Date: Sun, 29 Dec 2013 22:06:55 +0100
0a122b
Subject: [PATCH 4/8] qemu-iotests: Remaining error propagation adjustments
0a122b
0a122b
RH-Author: Max Reitz <mreitz@redhat.com>
0a122b
Message-id: <1388354817-3013-4-git-send-email-mreitz@redhat.com>
0a122b
Patchwork-id: 56445
0a122b
O-Subject: [RHEL-7.0 qemu-kvm PATCH 3/5] qemu-iotests: Remaining error propagation adjustments
0a122b
Bugzilla: 1004347
0a122b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
0a122b
RH-Acked-by: Fam Zheng <famz@redhat.com>
0a122b
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
0a122b
0a122b
BZ: 1004347
0a122b
0a122b
This downstream-only patch contains the hunks which have been omitted
0a122b
when aaf2d00ea8cd6479c5dd15773660e0699472af1c was cherry-picked from
0a122b
2c78857bf6a9b5d06e17533b8f40fee14e087987, i.e., fixes tests 054 and 060.
0a122b
0a122b
Furthermore, this sets the executable bit for the tests 060, 063 and 067
0a122b
(which, for some reason, have been cleared until now).
0a122b
0a122b
Signed-off-by: Max Reitz <mreitz@redhat.com>
0a122b
---
0a122b
 tests/qemu-iotests/054.out | 4 ++--
0a122b
 tests/qemu-iotests/060     | 2 +-
0a122b
 tests/qemu-iotests/060.out | 3 +--
0a122b
 tests/qemu-iotests/063     | 0
0a122b
 tests/qemu-iotests/067     | 0
0a122b
 5 files changed, 4 insertions(+), 5 deletions(-)
0a122b
 mode change 100644 => 100755 tests/qemu-iotests/060
0a122b
 mode change 100644 => 100755 tests/qemu-iotests/063
0a122b
 mode change 100644 => 100755 tests/qemu-iotests/067
0a122b
0a122b
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
0a122b
old mode 100644
0a122b
new mode 100755
0a122b
index 65bb09f..9bbc43b
0a122b
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
0a122b
old mode 100644
0a122b
new mode 100755
0a122b
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
0a122b
old mode 100644
0a122b
new mode 100755
0a122b
0a122b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
0a122b
---
0a122b
 tests/qemu-iotests/054.out |    4 ++--
0a122b
 tests/qemu-iotests/060     |    2 +-
0a122b
 tests/qemu-iotests/060.out |    3 +--
0a122b
 3 files changed, 4 insertions(+), 5 deletions(-)
0a122b
0a122b
diff --git a/tests/qemu-iotests/054.out b/tests/qemu-iotests/054.out
0a122b
index 0b2fe30..7161d6e 100644
0a122b
--- a/tests/qemu-iotests/054.out
0a122b
+++ b/tests/qemu-iotests/054.out
0a122b
@@ -1,10 +1,10 @@
0a122b
 QA output created by 054
0a122b
 
0a122b
 creating too large image (1 EB)
0a122b
-qemu-img: The image size is too large for file format 'qcow2'
0a122b
+qemu-img: TEST_DIR/t.IMGFMT: The image size is too large for file format 'IMGFMT' (try using a larger cluster size)
0a122b
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1152921504606846976 
0a122b
 
0a122b
 creating too large image (1 EB) using qcow2.py
0a122b
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4294967296 
0a122b
-qemu-img: Could not open 'TEST_DIR/t.qcow2': File too large
0a122b
+qemu-img: Could not open 'TEST_DIR/t.qcow2': Image is too big
0a122b
 *** done
0a122b
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
0a122b
index 65bb09f..9bbc43b 100644
0a122b
--- a/tests/qemu-iotests/060
0a122b
+++ b/tests/qemu-iotests/060
0a122b
@@ -71,7 +71,7 @@ $QEMU_IO -c "write -P 0x2a 0 512" "$TEST_IMG" | _filter_qemu_io
0a122b
 ./qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
0a122b
 
0a122b
 # Try to open the image R/W (which should fail)
0a122b
-$QEMU_IO -c "read 0 512" "$TEST_IMG" 2>&1 | _filter_qemu_io | sed -e "s/can't open device .*$/can't open device/"
0a122b
+$QEMU_IO -c "read 0 512" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir | _filter_imgfmt
0a122b
 
0a122b
 # Try to open it RO (which should succeed)
0a122b
 $QEMU_IO -c "read 0 512" -r "$TEST_IMG" | _filter_qemu_io
0a122b
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
0a122b
index ca4583a..648f743 100644
0a122b
--- a/tests/qemu-iotests/060.out
0a122b
+++ b/tests/qemu-iotests/060.out
0a122b
@@ -11,8 +11,7 @@ incompatible_features     0x0
0a122b
 qcow2: Preventing invalid write on metadata (overlaps with active L1 table); image marked as corrupt.
0a122b
 write failed: Input/output error
0a122b
 incompatible_features     0x2
0a122b
-qcow2: Image is corrupt; cannot be opened read/write.
0a122b
-qemu-io: can't open device
0a122b
+qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
0a122b
 no file open, try 'help open'
0a122b
 read 512/512 bytes at offset 0
0a122b
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
0a122b
-- 
0a122b
1.7.1
0a122b