From 62d9de47660c26033c87af676be8a56c206f0238 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Fri, 14 Jan 2011 15:06:35 -0800 Subject: [PATCH] Fix clitests for cauthtool usage change. --- src/test/cli/cauthtool/help.t | 17 ++++++++++++++++- src/test/cli/cauthtool/simple.t | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/test/cli/cauthtool/help.t b/src/test/cli/cauthtool/help.t index 339e2cd3f91d6..bfb8a0845406c 100644 --- a/src/test/cli/cauthtool/help.t +++ b/src/test/cli/cauthtool/help.t @@ -1,5 +1,20 @@ # TODO synchronize with man page $ cauthtool --help no command specified - usage: [--create-keyring] [--gen-key] [--name=] [--set-uid=uid] [--caps=] [--list] [--print-key] + usage: cauthtool keyringfile [OPTIONS]... + where the options are: + -l, --list will list all keys and capabilities present in + the keyring + -p, --print will print an encoded key for the specified + entityname. This is suitable for the + '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 + specified entityname + --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 + -b, --bin will create a binary formatted keyring [1] diff --git a/src/test/cli/cauthtool/simple.t b/src/test/cli/cauthtool/simple.t index f016e91362ad6..015b5de8a239a 100644 --- a/src/test/cli/cauthtool/simple.t +++ b/src/test/cli/cauthtool/simple.t @@ -1,4 +1,19 @@ $ cauthtool cauthtool: must specify filename - usage: [--create-keyring] [--gen-key] [--name=] [--set-uid=uid] [--caps=] [--list] [--print-key] + usage: cauthtool keyringfile [OPTIONS]... + where the options are: + -l, --list will list all keys and capabilities present in + the keyring + -p, --print will print an encoded key for the specified + entityname. This is suitable for the + '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 + specified entityname + --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 + -b, --bin will create a binary formatted keyring [1] -- 2.39.5