From: Kefu Chai <kchai@redhat.com>
Date: Mon, 19 Jun 2017 03:02:52 +0000 (+0800)
Subject: qa/workunits/mon/auth_caps.sh: Revert "qa/workunits: mon: auth_caps: account for... 
X-Git-Tag: v12.1.1~191^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e1d85775a536cae37a7b998e63ef7bda471fde9;p=ceph.git

qa/workunits/mon/auth_caps.sh: Revert "qa/workunits: mon: auth_caps: account for mon blank caps"

This reverts commit f0653c0401eafd154dd4579e6bcf6caa7627cf4c.

--force is not implemented by AuthMonitor. so revert this change to test
it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/workunits/mon/auth_caps.sh b/qa/workunits/mon/auth_caps.sh
index 74b22778c00..43d5747ce2d 100755
--- a/qa/workunits/mon/auth_caps.sh
+++ b/qa/workunits/mon/auth_caps.sh
@@ -13,8 +13,7 @@ for i in ${combinations}; do
 done
 
 # add special caps
-# force blank cap with '--force'
-keymap["blank"]=`ceph auth get-or-create-key client.blank mon 'allow' --force` || exit 1
+keymap["blank"]=`ceph auth get-or-create-key client.blank mon 'allow'` || exit 1
 keymap["all"]=`ceph auth get-or-create-key client.all mon 'allow *'` || exit 1
 
 tmp=`mktemp`
@@ -80,7 +79,6 @@ write_ops() {
   local caps=$1
   local has_read=1 has_write=1 has_exec=1
   local ret
-  local err
   local args
 
   ( echo $caps | grep 'r' ) || has_read=0
@@ -103,16 +101,9 @@ write_ops() {
   expect $ret ceph auth add client.foo $args
   expect $ret "ceph auth caps client.foo mon 'allow *' $args"
   expect $ret ceph auth get-or-create client.admin $args
-  echo "wtf -- before: err=$err ret=$ret"
-  err=$ret
-  [[ $ret -eq 0 ]] && err=22 # EINVAL
-  expect $err "ceph auth get-or-create client.bar mon 'allow' $args"
-  echo "wtf -- after: err=$err ret=$ret"
-  expect $ret "ceph auth get-or-create client.bar mon 'allow' --force $args"
+  expect $ret "ceph auth get-or-create client.bar mon 'allow' $args"
   expect $ret ceph auth get-or-create-key client.admin $args
   expect $ret ceph auth get-or-create-key client.baz $args
-  expect $ret ceph auth del client.bar $args
-  expect $ret ceph auth del client.baz $args
   expect $ret ceph auth del client.foo $args
   expect $ret ceph auth import -i $tmp $args
 }