qa/workunits/cephtool/test.sh: update test for "ceph mds setmap"

Signed-off-by: Yan, Zheng <zyan@redhat.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 5b6fbf25c7f88f287ba1196b2cc5d705d846847f..e40eb21e98108645e10f40a32b85f9e5cd0fb067 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -775,10 +775,15 @@ function test_mon_mds()
   ((epoch2 = current_epoch + 2))
   ((epoch3 = current_epoch + 3))
   ((epoch4 = current_epoch + 4))
-  ceph mds setmap -i $mdsmapfile $epoch || \
-      ceph mds setmap -i $mdsmapfile $epoch2 || \
-      ceph mds setmap -i $mdsmapfile $epoch3 || \
-      ceph mds setmap -i $mdsmapfile $epoch4
+  # no conformation
+  expect_false ceph mds setmap -i $mdsmapfile $epoch
+  # no input
+  expect_false ceph mds setmap $epoch --yes-i-really-mean-it
+
+  ceph mds setmap -i $mdsmapfile $epoch --yes-i-really-mean-it || \
+      ceph mds setmap -i $mdsmapfile $epoch2 --yes-i-really-mean-it || \
+      ceph mds setmap -i $mdsmapfile $epoch3 --yes-i-really-mean-it || \
+      ceph mds setmap -i $mdsmapfile $epoch4 --yes-i-really-mean-it
   rm $mdsmapfile
 
   ceph osd pool create data2 10