From: Sage Weil Date: Wed, 6 Aug 2014 20:16:49 +0000 (-0700) Subject: qa/workunits/cephtool/test.sh: fix 'ceph df ...' tests X-Git-Tag: v0.85~81 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea731ae14216bb479eff1f86ed6bd4a7cb71fb56;p=ceph.git qa/workunits/cephtool/test.sh: fix 'ceph df ...' tests Broken by ee2dbdb0f5e54fe6f9c5999c032063b084424c4c and friends. Signed-off-by: Sage Weil --- diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index f8d13947eeb2..d2a8343fd2b4 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -302,13 +302,13 @@ function test_mon_misc() grep CATEGORY $TMPFILE grep DIRTY $TMPFILE ceph df --format json > $TMPFILE - grep 'total_space' $TMPFILE + grep 'total_bytes' $TMPFILE grep -v 'dirty' $TMPFILE ceph df detail --format json > $TMPFILE - grep 'rd_kb' $TMPFILE + grep 'rd_bytes' $TMPFILE grep 'dirty' $TMPFILE - ceph df --format xml | grep '' - ceph df detail --format xml | grep '' + ceph df --format xml | grep '' + ceph df detail --format xml | grep '' ceph fsid ceph health