From: Yan, Zheng <zyan@redhat.com>
Date: Mon, 18 Jan 2016 07:01:45 +0000 (+0800)
Subject: qa/workunits/cephtool/test.sh: update test for "ceph mds setmap"
X-Git-Tag: v10.0.3~9^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8af0758638a53df5a4d1e61bd3fd19f461d77d09;p=ceph.git

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 5b6fbf25c7f..e40eb21e981 100755
--- 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