From: Loic Dachary <loic@dachary.org>
Date: Fri, 3 Jan 2014 21:52:55 +0000 (+0100)
Subject: ceph-disk: fix false positive for gitbuilder
X-Git-Tag: v0.77~53^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1040%2Fhead;p=ceph.git

ceph-disk: fix false positive for gitbuilder

The output of test/ceph-disk.sh is very verbose which is good for
debugging errors. However it sometime contains strings that match
/error:/i which is picked by gitbuilder as a sign that the test fail,
even when the exit code is zero.

Remove from the output the three strings triggering false positive in
gitbuilder.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index 2dd83f73f25..e4976bca406 100755
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -148,7 +148,7 @@ function test_activate_dir_magic() {
 
     mkdir -p $osd_data/fsid
     CEPH_ARGS="--fsid $uuid" \
-     ./ceph-disk $CEPH_DISK_ARGS prepare $osd_data 2>&1 | tee $DIR/out
+     ./ceph-disk $CEPH_DISK_ARGS prepare $osd_data > $DIR/out 2>&1
     grep --quiet 'Is a directory' $DIR/out || return 1
     ! [ -f $osd_data/magic ] || return 1
     rmdir $osd_data/fsid
@@ -200,8 +200,8 @@ function test_find_cluster_by_uuid() {
 
     setup
     rm $DIR/ceph.conf
-    test_activate_dir 2>&1 | tee $DIR/test_find
-    grep "No cluster conf found in $DIR" $DIR/test_find || return 1
+    test_activate_dir > $DIR/test_find 2>&1 
+    grep --quiet "No cluster conf found in $DIR" $DIR/test_find || return 1
     teardown
 }