|
 |
9119d9 |
From d6db45d8d91467a2b38544a6f9b6856338d37a6b Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <d6db45d8d91467a2b38544a6f9b6856338d37a6b@dist-git>
|
|
|
9119d9 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
9119d9 |
Date: Fri, 21 Nov 2014 15:04:07 +0100
|
|
|
9119d9 |
Subject: [PATCH] tests: Reflow the expected output from RBD disk test
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1164528
|
|
|
9119d9 |
|
|
|
9119d9 |
Addition of tested cases to the test will be more obvious.
|
|
|
9119d9 |
|
|
|
9119d9 |
(cherry picked from commit 162e1ac6face347d9e93715a5224653cd284a0ef)
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
.../qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args | 10 +++++-----
|
|
|
9119d9 |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args
|
|
|
9119d9 |
index 30f8845..21d7b64 100644
|
|
|
9119d9 |
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args
|
|
|
9119d9 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args
|
|
|
9119d9 |
@@ -1,8 +1,8 @@
|
|
|
9119d9 |
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
|
|
|
9119d9 |
/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor \
|
|
|
9119d9 |
-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \
|
|
|
9119d9 |
-file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw -drive \
|
|
|
9119d9 |
-'file=rbd:pool/image:auth_supported=none:\
|
|
|
9119d9 |
+unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
|
|
|
9119d9 |
+-drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=raw \
|
|
|
9119d9 |
+-drive 'file=rbd:pool/image:auth_supported=none:\
|
|
|
9119d9 |
mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;\
|
|
|
9119d9 |
-mon3.example.org\:6322,\
|
|
|
9119d9 |
-if=virtio,format=raw' -net none -serial none -parallel none
|
|
|
9119d9 |
+mon3.example.org\:6322,if=virtio,format=raw' \
|
|
|
9119d9 |
+-net none -serial none -parallel none
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.3
|
|
|
9119d9 |
|