From: Loic Dachary <loic-201408@dachary.org>
Date: Sun, 31 Aug 2014 20:59:04 +0000 (+0200)
Subject: tests: qa/workunits/cephtool/test.sh early fail
X-Git-Tag: v0.86~160^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2367%2Fhead;p=ceph.git

tests: qa/workunits/cephtool/test.sh early fail

Add tests to fail as soon as an unexpected condition is met in
test_mon_osd. Otherwise the actual error will be more difficult find in
the logs.

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

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 80bf76c65b385..97b2b3d3c4ebd 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -522,6 +522,7 @@ function test_mon_osd()
       break
     fi
   done
+  ceph osd dump | grep 'osd.0 up'
 
   ceph osd thrash 10
   ceph osd down `seq 0 31`  # force everything down so that we can trust up
@@ -534,6 +535,8 @@ function test_mon_osd()
       break
     fi
   done
+  ! ceph osd dump | grep ' down '
+  
   # if you have more osds than this you are on your own
   for f in `seq 0 31`; do
     ceph osd in $f || true