summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-07-28 15:29:49 -0700
committerSage Weil <sage@inktank.com>2013-07-28 15:29:49 -0700
commit74c1bec2aa01caf0237b4750cf05404b6d09aa18 (patch)
tree9e68f7e91cc6b7c49f5c1efce87aa7556129c3b0
parent7b683f7f6a4b1fbb526c4f5f5660cc36f6a3abbd (diff)
downloadceph-74c1bec2aa01caf0237b4750cf05404b6d09aa18.tar.gz
ceph-authtool: fix cli tests
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/test/cli/ceph-authtool/help.t10
-rw-r--r--src/test/cli/ceph-authtool/manpage.t10
-rw-r--r--src/test/cli/ceph-authtool/simple.t10
3 files changed, 24 insertions, 6 deletions
diff --git a/src/test/cli/ceph-authtool/help.t b/src/test/cli/ceph-authtool/help.t
index 7434ec4a7c0..062c967a154 100644
--- a/src/test/cli/ceph-authtool/help.t
+++ b/src/test/cli/ceph-authtool/help.t
@@ -10,9 +10,15 @@
'mount -o secret=..' argument
-C, --create-keyring will create a new keyring, overwriting any
existing keyringfile
- --gen-key will generate a new secret key for the
+ -g, --gen-key will generate a new secret key for the
specified entityname
- --add-key will add an encoded key to the keyring
+ --gen-print-key will generate a new secret key without set it
+ to the keyringfile, prints the secret to stdout
+ --import-keyring will import the content of a given keyring
+ into the keyringfile
+ -u, --set-uid sets the auid (authenticated user id) for the
+ specified entityname
+ -a, --add-key will add an encoded key to the keyring
--cap subsystem capability will set the capability for given subsystem
--caps capsfile will set all of capabilities associated with a
given key, for all subsystems
diff --git a/src/test/cli/ceph-authtool/manpage.t b/src/test/cli/ceph-authtool/manpage.t
index 69e15fa51c3..a9e1408d716 100644
--- a/src/test/cli/ceph-authtool/manpage.t
+++ b/src/test/cli/ceph-authtool/manpage.t
@@ -9,9 +9,15 @@
'mount -o secret=..' argument
-C, --create-keyring will create a new keyring, overwriting any
existing keyringfile
- --gen-key will generate a new secret key for the
+ -g, --gen-key will generate a new secret key for the
specified entityname
- --add-key will add an encoded key to the keyring
+ --gen-print-key will generate a new secret key without set it
+ to the keyringfile, prints the secret to stdout
+ --import-keyring will import the content of a given keyring
+ into the keyringfile
+ -u, --set-uid sets the auid (authenticated user id) for the
+ specified entityname
+ -a, --add-key will add an encoded key to the keyring
--cap subsystem capability will set the capability for given subsystem
--caps capsfile will set all of capabilities associated with a
given key, for all subsystems
diff --git a/src/test/cli/ceph-authtool/simple.t b/src/test/cli/ceph-authtool/simple.t
index 69d027c1342..b86476a5ad0 100644
--- a/src/test/cli/ceph-authtool/simple.t
+++ b/src/test/cli/ceph-authtool/simple.t
@@ -9,9 +9,15 @@
'mount -o secret=..' argument
-C, --create-keyring will create a new keyring, overwriting any
existing keyringfile
- --gen-key will generate a new secret key for the
+ -g, --gen-key will generate a new secret key for the
specified entityname
- --add-key will add an encoded key to the keyring
+ --gen-print-key will generate a new secret key without set it
+ to the keyringfile, prints the secret to stdout
+ --import-keyring will import the content of a given keyring
+ into the keyringfile
+ -u, --set-uid sets the auid (authenticated user id) for the
+ specified entityname
+ -a, --add-key will add an encoded key to the keyring
--cap subsystem capability will set the capability for given subsystem
--caps capsfile will set all of capabilities associated with a
given key, for all subsystems