Rebase swiftkerbauth imported code with upstream

Few changes have been merged to upstream swiftkerbauth repo.
This commit brings it down to gluster-swift repo.
Bringing below changes to gluster-swift repo in one go.

http://review.gluster.org/#/c/6296/
http://review.gluster.org/#/c/6370/
http://review.gluster.org/#/c/6595/
http://review.gluster.org/#/c/6713/
http://review.gluster.org/#/c/6732/

Change-Id: I10dc12d75ec63fca313339fbc71e4f18071af552
Signed-off-by: Chetan Risbud <crisbud@redhat.com>
Reviewed-on: http://review.gluster.org/6764
Reviewed-by: Prashanth Pai <ppai@redhat.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/test/unit/common/middleware/swiftkerbauth/test_kerbauth_utils.py b/test/unit/common/middleware/swiftkerbauth/test_kerbauth_utils.py
index c5da168..2a4e90b 100644
--- a/test/unit/common/middleware/swiftkerbauth/test_kerbauth_utils.py
+++ b/test/unit/common/middleware/swiftkerbauth/test_kerbauth_utils.py
@@ -17,7 +17,6 @@ import unittest
 import re
 from time import time
 from test.unit import FakeMemcache
-from gluster.swift.common.middleware.swiftkerbauth import kerbauth as auth
 from gluster.swift.common.middleware.swiftkerbauth import kerbauth_utils as ku
 
 
@@ -63,15 +62,15 @@ class TestKerbUtils(unittest.TestCase):
     def test_generate_token(self):
         token = ku.generate_token()
         matches = re.match('AUTH_tk[a-f0-9]{32}', token)
-        self.assertNotEqual(matches, None)
+        self.assertTrue(matches is not None)
 
-    def test_get_groups(self):
-        groups = ku.get_groups("root")
+    def test_get_groups_from_username(self):
+        groups = ku.get_groups_from_username("root")
         self.assertTrue("root" in groups)
 
-    def test_get_groups_err(self):
+    def test_get_groups_from_username_err(self):
         try:
-            ku.get_groups("Zroot")
+            ku.get_groups_from_username("Zroot")
         except RuntimeError as err:
             self.assertTrue(err.args[0].startswith("Failure running id -G"))
         else: