summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorThiago da Silva <thiago@redhat.com>2013-11-25 12:18:03 -0500
committerLuis Pabon <lpabon@redhat.com>2013-11-27 04:40:06 -0800
commitba6171a2dfd924d2a935823bb4273a6ae5f6f5cb (patch)
tree22db0ed4f90304fd29e7a721d0b97701164f03f1 /test
parent3796a1c757f2ea805afead70a58d84ea6ad46374 (diff)
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 <thiago@redhat.com> Reviewed-on: http://review.gluster.org/6347 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
Diffstat (limited to 'test')
-rw-r--r--test/functional_auth/gswauth/test_gswauth_cli.py17
1 files changed, 15 insertions, 2 deletions
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
@@ -34,6 +34,10 @@ class Utils:
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):