yeahuh / rpms / qemu-kvm

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