qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Loic Dachary <loic@dachary.org>
To: Stefan Hajnoczi <stefanha@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH] discard rbd error output when not relevant in qemu-iotests
Date: Mon, 30 Dec 2013 01:33:34 +0100	[thread overview]
Message-ID: <1388363614-25411-1-git-send-email-loic@dachary.org> (raw)

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 <loic@dachary.org>
---
 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

             reply	other threads:[~2013-12-30  0:33 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-30  0:33 Loic Dachary [this message]
2013-12-30  0:39 ` [Qemu-devel] [PATCH] discard rbd error output when not relevant in qemu-iotests Benoît Canet
2013-12-30  0:50   ` Loic Dachary
2014-01-06  2:23 ` Stefan Hajnoczi
2014-01-06 15:50   ` Loic Dachary
2014-01-08  4:33     ` Stefan Hajnoczi
2014-01-08  8:22       ` Loic Dachary
2014-01-08 20:05 ` [Qemu-devel] [PATCH v2] " Loic Dachary
2014-01-08 21:25   ` Josh Durgin
2014-01-09  1:45   ` Stefan Hajnoczi
2014-02-16 16:03     ` Benoît Canet
2014-02-27 15:22   ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1388363614-25411-1-git-send-email-loic@dachary.org \
    --to=loic@dachary.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).