ceph-authtool: fix clitests

No more --bin option.

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

diff --git a/src/test/cli/ceph-authtool/cap-bin.t b/src/test/cli/ceph-authtool/cap-bin.t
index c0adb1f53640a5b11937fed179858f0b9910d50c..50efa5c9dd7ef837615434314db76ec0ffdfed5d 100644 (file)
--- a/src/test/cli/ceph-authtool/cap-bin.t
+++ b/src/test/cli/ceph-authtool/cap-bin.t
@@ -1,6 +1,6 @@
-  $ ceph-authtool kring --create-keyring --gen-key --bin
+  $ ceph-authtool kring --create-keyring --gen-key
   creating kring
 
-  $ ceph-authtool --cap osd 'allow rx pool=swimming' --bin kring
+  $ ceph-authtool --cap osd 'allow rx pool=swimming' kring
   $ ceph-authtool kring --list|grep -P '^\tcaps '
   \tcaps osd = "allow rx pool=swimming" (esc)

diff --git a/src/test/cli/ceph-authtool/create-gen-list-bin.t b/src/test/cli/ceph-authtool/create-gen-list-bin.t
index 84e636e633d8b93bbbc405e43a8cd4c75f776e1f..bfd2a4322dfc4cc2dae242437c3792d743515efb 100644 (file)
--- a/src/test/cli/ceph-authtool/create-gen-list-bin.t
+++ b/src/test/cli/ceph-authtool/create-gen-list-bin.t
@@ -1,13 +1,9 @@
-  $ ceph-authtool kring --create-keyring --bin
+  $ ceph-authtool kring --create-keyring
   creating kring
 
-  $ ceph-authtool kring --list --bin
-
-# --list actually does not use --bin, but autodetects; run it both
-# ways just to trigger that
   $ ceph-authtool kring --list
 
-  $ ceph-authtool kring --gen-key --bin
+  $ ceph-authtool kring --gen-key
 
 # cram makes matching escape-containing lines with regexps a bit ugly
   $ ceph-authtool kring --list

diff --git a/src/test/cli/ceph-authtool/help.t b/src/test/cli/ceph-authtool/help.t
index d19330a1ca70f2b2dcc244cc0f4368d27ec20054..957325dabc0350c083f9a4f680dec2dee5e4c418 100644 (file)
--- a/src/test/cli/ceph-authtool/help.t
+++ b/src/test/cli/ceph-authtool/help.t
@@ -16,5 +16,4 @@
     --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
-    -b, --bin                     will create a binary formatted keyring
   [1]

diff --git a/src/test/cli/ceph-authtool/list-empty-bin.t b/src/test/cli/ceph-authtool/list-empty-bin.t
index f8d517f8931b9740e50b39ee186e12bfb0dde6d5..1b465fe6560af1bc7b33346fc8d40287cb4ab7d5 100644 (file)
--- a/src/test/cli/ceph-authtool/list-empty-bin.t
+++ b/src/test/cli/ceph-authtool/list-empty-bin.t
@@ -1,5 +1,5 @@
   $ touch empty
 
-  $ ceph-authtool --list --bin empty
+  $ ceph-authtool --list empty
 
-  $ ceph-authtool -l --bin empty
+  $ ceph-authtool -l empty

diff --git a/src/test/cli/ceph-authtool/list-nonexistent-bin.t b/src/test/cli/ceph-authtool/list-nonexistent-bin.t
index 3ee54c536b17cde257f2ef88223034b4ef09a81f..4aecd3e270293e317b675ec9bcbb8836f56a30ab 100644 (file)
--- a/src/test/cli/ceph-authtool/list-nonexistent-bin.t
+++ b/src/test/cli/ceph-authtool/list-nonexistent-bin.t
@@ -1,7 +1,7 @@
-  $ ceph-authtool --list --bin nonexistent
+  $ ceph-authtool --list nonexistent
   can't open nonexistent: can't open nonexistent: (2) No such file or directory
   [1]
 
-  $ ceph-authtool -l --bin nonexistent
+  $ ceph-authtool -l nonexistent
   can't open nonexistent: can't open nonexistent: (2) No such file or directory
   [1]

diff --git a/src/test/cli/ceph-authtool/manpage.t b/src/test/cli/ceph-authtool/manpage.t
index e64ac9a3c31de62b2968ae626fbc9d033d6fada7..f352e89bb420c12e922b974afdcf3b83e3d980f6 100644 (file)
--- a/src/test/cli/ceph-authtool/manpage.t
+++ b/src/test/cli/ceph-authtool/manpage.t
@@ -15,7 +15,6 @@
     --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
-    -b, --bin                     will create a binary formatted keyring
   [1]
 
 # demonstrate that manpage examples fail without config

diff --git a/src/test/cli/ceph-authtool/simple.t b/src/test/cli/ceph-authtool/simple.t
index e2317d45a05331149117c283b4723ed79f76b39a..16a1d50adaf6ad2b0c452de4f0d8e9f744e97aec 100644 (file)
--- a/src/test/cli/ceph-authtool/simple.t
+++ b/src/test/cli/ceph-authtool/simple.t
@@ -15,5 +15,4 @@
     --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
-    -b, --bin                     will create a binary formatted keyring
   [1]