From: Daira Hopwood Date: Fri, 16 Oct 2015 16:56:15 +0000 (+0100) Subject: Help for admin commands: cosmetics and new tests. X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/flags/-?a=commitdiff_plain;h=932d229e08205486b7f12ad2e552d59d779ede30;p=tahoe-lafs%2Ftahoe-lafs.git Help for admin commands: cosmetics and new tests. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/scripts/admin.py b/src/allmydata/scripts/admin.py index 6dab86ab..23ac8a1a 100644 --- a/src/allmydata/scripts/admin.py +++ b/src/allmydata/scripts/admin.py @@ -3,12 +3,13 @@ from twisted.python import usage from allmydata.scripts.common import BaseOptions class GenerateKeypairOptions(BaseOptions): + def getSynopsis(self): + return "Usage: %s [global-options] admin generate-keypair" % (self.command_name,) def getUsage(self, width=None): t = BaseOptions.getUsage(self, width) t += """ -Generate a public/private keypair, dumped to stdout as two lines of ASCII.. - +Generate a public/private keypair, dumped to stdout as two lines of ASCII. """ return t @@ -24,14 +25,13 @@ class DerivePubkeyOptions(BaseOptions): self.privkey = privkey def getSynopsis(self): - return "Usage: tahoe [global-options] admin derive-pubkey PRIVKEY" + return "Usage: %s [global-options] admin derive-pubkey PRIVKEY" % (self.command_name,) def getUsage(self, width=None): t = BaseOptions.getUsage(self, width) t += """ Given a private (signing) key that was previously generated with generate-keypair, derive the public key and print it to stdout. - """ return t diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py index 756589b3..c3a66860 100644 --- a/src/allmydata/test/test_cli.py +++ b/src/allmydata/test/test_cli.py @@ -17,10 +17,10 @@ import allmydata.scripts.common_http from pycryptopp.publickey import ed25519 # Test that the scripts can be imported. -from allmydata.scripts import create_node, debug, keygen, startstop_node, \ +from allmydata.scripts import create_node, admin, debug, keygen, startstop_node, \ tahoe_add_alias, tahoe_backup, tahoe_check, tahoe_cp, tahoe_get, tahoe_ls, \ tahoe_manifest, tahoe_mkdir, tahoe_mv, tahoe_put, tahoe_unlink, tahoe_webopen -_hush_pyflakes = [create_node, debug, keygen, startstop_node, +_hush_pyflakes = [create_node, admin, debug, keygen, startstop_node, tahoe_add_alias, tahoe_backup, tahoe_check, tahoe_cp, tahoe_get, tahoe_ls, tahoe_manifest, tahoe_mkdir, tahoe_mv, tahoe_put, tahoe_unlink, tahoe_webopen] @@ -615,6 +615,18 @@ class Help(unittest.TestCase): subhelp = str(oClass()) self.failUnlessIn(" [global-options] debug flogtool %s " % (option,), subhelp) + def test_create_admin(self): + help = str(admin.AdminCommand()) + self.failUnlessIn(" [global-options] admin SUBCOMMAND", help) + + def test_create_admin_generate_keypair(self): + help = str(admin.GenerateKeypairOptions()) + self.failUnlessIn(" [global-options] admin generate-keypair", help) + + def test_create_admin_derive_pubkey(self): + help = str(admin.DerivePubkeyOptions()) + self.failUnlessIn(" [global-options] admin derive-pubkey", help) + class Ln(GridTestMixin, CLITestMixin, unittest.TestCase): def _create_test_file(self):