From: Sage Weil Date: Fri, 18 May 2012 17:59:52 +0000 (-0700) Subject: ceph-authtool: fix clitests X-Git-Tag: v0.48argonaut~137^2~36 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fb3cd281dad321d24aafc5137d7dba24a625977;p=ceph.git ceph-authtool: fix clitests No more --bin option. Signed-off-by: Sage Weil --- diff --git a/src/test/cli/ceph-authtool/cap-bin.t b/src/test/cli/ceph-authtool/cap-bin.t index c0adb1f53640..50efa5c9dd7e 100644 --- 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 84e636e633d8..bfd2a4322dfc 100644 --- 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 d19330a1ca70..957325dabc03 100644 --- 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 f8d517f8931b..1b465fe6560a 100644 --- 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 3ee54c536b17..4aecd3e27029 100644 --- 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 e64ac9a3c31d..f352e89bb420 100644 --- 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 e2317d45a053..16a1d50adaf6 100644 --- 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]