From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Jul 2017 21:37:03 +0000 (-0400)
Subject: qa/workunits/cephtool/test.sh: fix test to watch audit channel
X-Git-Tag: v12.1.2~200^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16470%2Fhead;p=ceph.git

qa/workunits/cephtool/test.sh: fix test to watch audit channel

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index f23ec5ee7e2a..694e1968feb3 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -163,6 +163,9 @@ function ceph_watch_start()
 
     if [ -n "$1" ]; then
 	whatch_opt=--watch-$1
+	if [ -n "$2" ]; then
+	    whatch_opt+=" --watch-channel $2"
+	fi
     fi
 
     CEPH_WATCH_FILE=${TEMP_DIR}/CEPH_WATCH_$$
@@ -2269,11 +2272,11 @@ function test_mon_tell()
 
   sleep 1
 
-  ceph_watch_start debug
+  ceph_watch_start debug audit
   ceph tell mon.a version
   ceph_watch_wait 'mon.a \[DBG\] from.*cmd=\[{"prefix": "version"}\]: dispatch'
 
-  ceph_watch_start debug
+  ceph_watch_start debug audit
   ceph tell mon.b version
   ceph_watch_wait 'mon.b \[DBG\] from.*cmd=\[{"prefix": "version"}\]: dispatch'
 }