From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 10 Apr 2013 17:43:13 +0000 (-0700)
Subject: test: update rbd formatted-output for progress changes
X-Git-Tag: v0.62~80^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3888a12385aa6fcf35c9cdce9ad82a2cdd3377b7;p=ceph.git

test: update rbd formatted-output for progress changes

Progress output now goes to stderr instead of stdout.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/src/test/cli-integration/rbd/formatted-output.t b/src/test/cli-integration/rbd/formatted-output.t
index ef0b7042c8a2..7be9c594a442 100644
--- a/src/test/cli-integration/rbd/formatted-output.t
+++ b/src/test/cli-integration/rbd/formatted-output.t
@@ -19,7 +19,7 @@ clone
   $ rbd snap protect bar@snap
   $ rbd clone bar@snap data/child
   $ rbd snap create data/child@snap
-  $ rbd flatten data/child > /dev/null
+  $ rbd flatten data/child 2> /dev/null
 
 lock
 ====
@@ -687,10 +687,10 @@ whenever it is run. grep -v to ignore it, but still work on other distros.
 # cleanup
   $ rbd snap remove data/child@snap
   $ rbd snap unprotect bar@snap
-  $ rbd snap purge bar > /dev/null
-  $ rbd snap purge foo > /dev/null
-  $ rbd rm data/child > /dev/null
-  $ rbd rm foo > /dev/null
-  $ rbd rm bar > /dev/null
-  $ rbd rm quux > /dev/null
-  $ rbd rm baz > /dev/null
+  $ rbd snap purge bar 2> /dev/null
+  $ rbd snap purge foo 2> /dev/null
+  $ rbd rm data/child 2> /dev/null
+  $ rbd rm foo 2> /dev/null
+  $ rbd rm bar 2> /dev/null
+  $ rbd rm quux 2> /dev/null
+  $ rbd rm baz 2> /dev/null