|
 |
9ae3a8 |
From 3c073988909052fb85088be3b45134fb0817286a Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 21 Jul 2015 17:30:55 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 2/3] block: update test 070 for vhdx
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <e195729e7dcad6a50dbb76abbfc29426fd616458.1437498454.git.jcody@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 67091
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH 2/2] block: update test 070 for vhdx
|
|
|
9ae3a8 |
Bugzilla: 1171576
|
|
|
9ae3a8 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This updates test 070 for VHDX - the sample image is added, and the
|
|
|
9ae3a8 |
expected error output is update to reflect the error message present
|
|
|
9ae3a8 |
downstream.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Downstream only, as this image file already exists upstream, and was
|
|
|
9ae3a8 |
missing downstream.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
tests/qemu-iotests/070 | 2 +-
|
|
|
9ae3a8 |
tests/qemu-iotests/070.out | 2 +-
|
|
|
9ae3a8 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070
|
|
|
9ae3a8 |
index 41bf100..ac23281 100755
|
|
|
9ae3a8 |
--- a/tests/qemu-iotests/070
|
|
|
9ae3a8 |
+++ b/tests/qemu-iotests/070
|
|
|
9ae3a8 |
@@ -56,7 +56,7 @@ _use_sample_img iotest-dirtylog-10G-4M.vhdx.bz2
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
echo
|
|
|
9ae3a8 |
echo "=== Verify open image read-only fails, due to dirty log ==="
|
|
|
9ae3a8 |
-$QEMU_IO -r -c "read -pP 0xa5 0 18M" "$TEST_IMG" 2>&1 | grep -o "Permission denied"
|
|
|
9ae3a8 |
+$QEMU_IO -r -c "read -pP 0xa5 0 18M" "$TEST_IMG" 2>&1 | grep -o "Operation not permitted"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
echo "=== Verify open image replays log ==="
|
|
|
9ae3a8 |
$QEMU_IO -c "read -pP 0xa5 0 18M" "$TEST_IMG" | _filter_qemu_io
|
|
|
9ae3a8 |
diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
|
|
|
9ae3a8 |
index 9db8ff2..91bfb04 100644
|
|
|
9ae3a8 |
--- a/tests/qemu-iotests/070.out
|
|
|
9ae3a8 |
+++ b/tests/qemu-iotests/070.out
|
|
|
9ae3a8 |
@@ -1,7 +1,7 @@
|
|
|
9ae3a8 |
QA output created by 070
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
=== Verify open image read-only fails, due to dirty log ===
|
|
|
9ae3a8 |
-Permission denied
|
|
|
9ae3a8 |
+Operation not permitted
|
|
|
9ae3a8 |
=== Verify open image replays log ===
|
|
|
9ae3a8 |
read 18874368/18874368 bytes at offset 0
|
|
|
9ae3a8 |
18 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|