From db63e2e59962d9b8d1cb009ec25198a621c61f9f Mon Sep 17 00:00:00 2001 From: Thiago da Silva Date: Mon, 25 Nov 2013 12:18:03 -0500 Subject: adding tabular output to swauth-list swauth-list now shows lists of accounts, users and groups in a tabular format (default). JSON and plain-text options are still available Change-Id: I897009f5f6c05aa4c14e306bb6ad35234e993fcd Signed-off-by: Thiago da Silva Reviewed-on: http://review.gluster.org/6347 Reviewed-by: Luis Pabon Tested-by: Luis Pabon Reviewed-on: http://review.gluster.org/6372 --- test/functional_auth/gswauth/test_gswauth_cli.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/functional_auth/gswauth/test_gswauth_cli.py b/test/functional_auth/gswauth/test_gswauth_cli.py index 2e6db11..f6c08df 100644 --- a/test/functional_auth/gswauth/test_gswauth_cli.py +++ b/test/functional_auth/gswauth/test_gswauth_cli.py @@ -33,6 +33,10 @@ class Utils: def deleteAccount(self,account_name,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): return commands.getstatusoutput('swauth-delete-account %s -A %s -U %s -K %s' % (account_name,authurl, user, key)) + @classmethod + def listAccounts(self,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): + return commands.getstatusoutput('swauth-list -A %s -U %s -K %s' % (authurl, user, key)) + @classmethod def swauthPrep(self,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): return commands.getstatusoutput('swauth-prep -A %s -U %s -K %s' % (authurl, user, key)) @@ -56,8 +60,8 @@ class Utils: @classmethod def cleanAll(self): #TODO:It's a dirty hack,any suggestions? - commands.getstatusoutput('rm -rf '+os.path.join(config['devices'], config['gsmetadata_volume'], '*')) - commands.getstatusoutput('rm -rf '+os.path.join(config['devices'], config['gsmetadata_volume'], '.*')) + commands.getstatusoutput('sudo rm -rf '+os.path.join(config['devices'], config['gsmetadata_volume'], '*')) + return commands.getstatusoutput('sudo rm -rf '+os.path.join(config['devices'], config['gsmetadata_volume'], '.*')) class TestSwauthPrep(unittest.TestCase): @@ -158,6 +162,15 @@ class TestAccount(unittest.TestCase): self.assertNotEqual(status, 0, 'account deletion failed for accountdoesnotexist'+output) #TODO:more cases + def testListAcounts(self): + (status,output)=Utils.addAccount('test') + self.assertEqual(status, 0, 'account creation failed'+output) + + (status,output)=Utils.listAccounts() + self.assertEqual(output, + '+----------+\n| Accounts |\n+----------+\n| test |\n+----------+', + 'swauth-list failed:\n%s' % output) + class TestUser(unittest.TestCase): -- cgit