[Qemu-devel] [PATCH] discard rbd error output when not relevant in qemu-iotests

[Loic Dachary]

Stash the rbd stderr and stdout because it also contains human readable
progress messages : Removing image: 3% complete... in addition to
potential error messages.

Display the stashed output if rbd exits on error.

Signed-off-by: Loic Dachary <address@hidden>
---
 tests/qemu-iotests/common.rc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 28ba0d9..af66bbd 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -189,7 +189,11 @@ _cleanup_test_img()
             ;;
 
         rbd)
-            rbd rm "$TEST_DIR/t.$IMGFMT" > /dev/null
+            if ! rbd rm "$TEST_DIR/t.$IMGFMT" > $TEST_DIR/rbd.out 2>&1
+            then
+                cat $TEST_DIR/rbd.out
+            fi
+            rm $TEST_DIR/rbd.out
             ;;
 
         sheepdog)
-- 
1.8.3.2