PEP8 for test cases by praveena

5 files changed, 190 insertions, 213 deletions

diff --git a/test/unit/test_authentication.py b/test/unit/test_authentication.py
index 43838143..c703192b 100644
--- a/test/unit/test_authentication.py
+++ b/test/unit/test_authentication.py
@@ -106,4 +106,4 @@ class authentication_test(unittest.TestCase):
         self.assertEqual('application/xml', content_type(resp))
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/test/unit/test_common.py b/test/unit/test_common.py
index 60be989d..e023fb3e 100644
--- a/test/unit/test_common.py
+++ b/test/unit/test_common.py
@@ -57,8 +57,7 @@ def create_tenant_group(groupid, tenantid, auth_token):
 
     url = '%stenant/%s/groups' % (URL, tenantid)
     body = {"group": {"id": groupid,
-                       "description": "A description ..."
-                         }}
+                       "description": "A description ..."}}
     resp, content = h.request(url, "POST", body=json.dumps(body),
                               headers={"Content-Type": "application/json",
                                        "X-Auth-Token": auth_token})
@@ -88,8 +87,7 @@ def create_global_group(groupid, auth_token):
 
     url = '%sgroups' % (URL)
     body = {"group": {"id": groupid,
-                       "description": "A description ..."
-                         }}
+                       "description": "A description ..."}}
     resp, content = h.request(url, "POST", body=json.dumps(body),
                               headers={"Content-Type": "application/json",
                                        "X-Auth-Token": auth_token})
@@ -118,6 +116,7 @@ def delete_global_group(groupid, auth_token):
                                        "X-Auth-Token": auth_token})
     return (resp, content)
 
+
 def delete_global_group_xml(groupid, auth_token):
     h = httplib2.Http(".cache")
     url = '%sgroups/%s' % (URL, groupid)
@@ -208,6 +207,7 @@ def delete_tenant_group_xml(groupid, tenantid, auth_token):
                                        "ACCEPT": "application/xml"})
     return (resp, content)
 
+
 def create_user(tenantid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%stenants/%s/users' % (URL, tenantid)
@@ -225,13 +225,14 @@ def create_user(tenantid, userid, auth_token):
 def delete_user(tenant, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%stenants/%s/users/%s' % (URL, tenant, userid)
-    
+
     resp, content = h.request(url, "DELETE", body='{}',
                               headers={"Content-Type": "application/json",
                                        "X-Auth-Token": auth_token})
-    
+
     return (resp, content)
 
+
 def create_user_xml(tenantid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%stenants/%s/users' % (URL, tenantid)
@@ -246,6 +247,7 @@ def create_user_xml(tenantid, userid, auth_token):
                                        "ACCEPT": "application/xml"})
     return (resp, content)
 
+
 def delete_user_xml(tenantid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%stenants/%s/users/%s' % (URL, tenantid, userid)
@@ -255,57 +257,63 @@ def delete_user_xml(tenantid, userid, auth_token):
                                        "ACCEPT": "application/xml"})
     return (resp, content)
 
+
 def add_user_tenant_group(tenantid, groupid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%stenants/%s/groups/%s/users/%s' % (URL, tenantid, groupid, userid)
-    
+
     resp, content = h.request(url, "PUT", body='',
                               headers={"Content-Type": "application/json",
                                        "X-Auth-Token": auth_token})
     return (resp, content)
 
+
 def add_user_tenant_group_xml(tenantid, groupid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%stenants/%s/groups/%s/users/%s' % (URL, tenantid, groupid, userid)
-    
+
     resp, content = h.request(url, "PUT", body='',
                               headers={"Content-Type": "application/xml",
                                        "X-Auth-Token": auth_token,
                                        "ACCEPT": "application/xml"})
     return (resp, content)
 
+
 def delete_user_tenant_group(tenantid, groupid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%stenants/%s/groups/%s/users/%s' % (URL, tenantid, groupid, userid)
-    
+
     resp, content = h.request(url, "DELETE", body='',
                               headers={"Content-Type": "application/json",
                                        "X-Auth-Token": auth_token})
     return (resp, content)
 
+
 def delete_user_tenant_group_xml(tenantid, groupid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%stenants/%s/groups/%s/users/%s' % (URL, tenantid, groupid, userid)
-    
+
     resp, content = h.request(url, "DELETE", body='',
                               headers={"Content-Type": "application/xml",
                                        "X-Auth-Token": auth_token,
                                        "ACCEPT": "application/xml"})
     return (resp, content)
 
+
 def get_user_tenant_group(tenantid, groupid, auth_token):
     h = httplib2.Http(".cache")
     url = '%stenants/%s/groups/%s/users' % (URL, tenantid, groupid)
-    
+
     resp, content = h.request(url, "GET", body='',
                               headers={"Content-Type": "application/json",
                                        "X-Auth-Token": auth_token})
     return (resp, content)
 
+
 def get_user_tenant_group_xml(tenantid, groupid, auth_token):
     h = httplib2.Http(".cache")
     url = '%stenants/%s/groups/%s/users' % (URL, tenantid, groupid)
-    
+
     resp, content = h.request(url, "GET", body='',
                               headers={"Content-Type": "application/xml",
                                        "X-Auth-Token": auth_token,
@@ -316,51 +324,56 @@ def get_user_tenant_group_xml(tenantid, groupid, auth_token):
 def add_user_global_group(groupid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%sgroups/%s/users/%s' % (URL, groupid, userid)
-    
+
     resp, content = h.request(url, "PUT", body='',
                               headers={"Content-Type": "application/json",
                                        "X-Auth-Token": auth_token})
     return (resp, content)
 
+
 def add_user_global_group_xml(groupid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%sgroups/%s/users/%s' % (URL, groupid, userid)
-    
+
     resp, content = h.request(url, "PUT", body='',
                               headers={"Content-Type": "application/xml",
                                        "X-Auth-Token": auth_token,
                                        "ACCEPT": "application/xml"})
     return (resp, content)
 
+
 def delete_user_global_group(groupid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%sgroups/%s/users/%s' % (URL, groupid, userid)
-    
+
     resp, content = h.request(url, "DELETE", body='',
                               headers={"Content-Type": "application/json",
                                        "X-Auth-Token": auth_token})
     return (resp, content)
 
+
 def delete_user_global_group_xml(groupid, userid, auth_token):
     h = httplib2.Http(".cache")
     url = '%sgroups/%s/users/%s' % (URL, groupid, userid)
-    
+
     resp, content = h.request(url, "DELETE", body='',
                               headers={"Content-Type": "application/xml",
                                        "X-Auth-Token": auth_token,
                                        "ACCEPT": "application/xml"})
     return (resp, content)
 
+
 def get_user_global_group(groupid, auth_token):
     h = httplib2.Http(".cache")
     url = '%sgroups/%s/users' % (URL, groupid)
-    
+
     resp, content = h.request(url, "GET", body='',
                               headers={"Content-Type": "application/json",
                                        "X-Auth-Token": auth_token})
-   
+
     return (resp, content)
 
+
 def get_userid():
     return 'test_user11'
 
@@ -372,16 +385,18 @@ def get_password():
 def get_email():
     return 'joetest@rackspace.com'
 
+
 def get_user_global_group_xml(groupid, auth_token):
     h = httplib2.Http(".cache")
     url = '%sgroups/%s/users' % (URL, groupid)
-    
+
     resp, content = h.request(url, "GET", body='',
                               headers={"Content-Type": "application/xml",
                                        "X-Auth-Token": auth_token,
                                        "ACCEPT": "application/xml"})
     return (resp, content)
-  
+
+
 def get_tenant():
     return '1234'
 
@@ -393,6 +408,7 @@ def get_user():
 def get_userdisabled():
     return 'disabled'
 
+
 def get_auth_token():
     return '999888777666'
 
@@ -400,12 +416,15 @@ def get_auth_token():
 def get_exp_auth_token():
     return '000999'
 
+
 def get_none_token():
     return ''
 
+
 def get_non_existing_token():
     return 'invalid_token'
 
+
 def get_disabled_token():
     return '999888777'
 
@@ -413,26 +432,27 @@ def get_disabled_token():
 def content_type(resp):
     return resp['content-type'].split(';')[0]
 
+
 def get_global_tenant():
     return 'GlobalTenant'
 
-def handle_user_resp(self,content, respvalue,resptype):
+
+def handle_user_resp(self, content, respvalue, resptype):
     if respvalue == 200:
         if resptype == 'application/json':
             content = json.loads(content)
             self.tenant = content['user']['tenantId']
             self.userid = content['user']['id']
         if resptype == 'application/xml':
-            content=etree.fromstring(content)
-            self.tenant=content.get("tenantId")
-            self.id=content.get("id")
-
+            content = etree.fromstring(content)
+            self.tenant = content.get("tenantId")
+            self.id = content.get("id")
 
     if respvalue == 500:
         self.fail('IDM fault')
     elif respvalue == 503:
         self.fail('Service Not Available')
 
+
 def content_type(resp):
     return resp['content-type'].split(';')[0]
-
diff --git a/test/unit/test_groups.py b/test/unit/test_groups.py
index 1e6e4be1..8f6ce46a 100644
--- a/test/unit/test_groups.py
+++ b/test/unit/test_groups.py
@@ -15,6 +15,8 @@ from test_common import *
 ##
 ## Global Group Tests
 ##
+
+
 class global_group_test(unittest.TestCase):
 
     def setUp(self):
@@ -40,7 +42,7 @@ class create_global_group_test(global_group_test):
                                               str(self.auth_token))
         respG, contentG = create_global_group(self.global_group,
                                               str(self.auth_token))
-        
+
         if int(respG['status']) == 500:
             self.fail('IDM fault')
         elif int(respG['status']) == 503:
@@ -51,15 +53,14 @@ class create_global_group_test(global_group_test):
     def test_global_group_create_xml(self):
         respG, contentG = delete_global_group_xml(self.global_group,
                                                   str(self.auth_token))
-        
         respG, contentG = create_global_group_xml(self.global_group,
                                                   str(self.auth_token))
-        
+
         if int(respG['status']) == 500:
             self.fail('IDM fault')
         elif int(respG['status']) == 503:
             self.fail('Service Not Available')
-        
+
         if int(respG['status']) not in (200, 201):
             self.fail('Failed due to %d' % int(respG['status']))
 
@@ -73,7 +74,6 @@ class create_global_group_test(global_group_test):
         elif int(respG['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(409, int(respG['status']))
-        
 
     def test_global_group_create_again_xml(self):
         respG, contentG = create_global_group_xml(self.global_group,
@@ -86,7 +86,6 @@ class create_global_group_test(global_group_test):
         elif int(respG['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(409, int(respG['status']))
-        
 
     def test_global_group_create_unauthorized_token(self):
         h = httplib2.Http(".cache")
@@ -129,8 +128,8 @@ class create_global_group_test(global_group_test):
                           "description": "A description ..."}}
         resp, content = h.request(url, "POST", body=json.dumps(body),
                                   headers={"Content-Type": "application/json",
-                                           "X-Auth-Token": self.exp_auth_token
-                                           })
+                                           "X-Auth-Token": \
+                                                   self.exp_auth_token})
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
@@ -190,8 +189,8 @@ class create_global_group_test(global_group_test):
                 "description": "A description ..." } }' % self.global_group
         resp, content = h.request(url, "POST", body=body,
                                   headers={"Content-Type": "application/json",
-                                           "X-Auth-Token": self.disabled_token
-                                           })
+                                           "X-Auth-Token": \
+                                                   self.disabled_token})
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
@@ -255,7 +254,7 @@ class get_global_groups_test(global_group_test):
                                               str(self.auth_token))
         respG, contentG = create_global_group(self.global_group,
                                               str(self.auth_token))
-        
+
         url = '%sgroups' % (URL)
         resp, content = h.request(url, "GET", body='{}',
                                   headers={"Content-Type": "application/json",
@@ -320,8 +319,8 @@ class get_global_groups_test(global_group_test):
         #test for Content-Type = application/json
         resp, content = h.request(url, "GET", body='{}',
                                   headers={"Content-Type": "application/json",
-                                           "X-Auth-Token": self.exp_auth_token
-                                           })
+                                           "X-Auth-Token": \
+                                                   self.exp_auth_token})
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
@@ -397,7 +396,7 @@ class get_global_group_test(global_group_test):
         h = httplib2.Http(".cache")
         respG, contentG = create_global_group_xml(self.global_group,
                                                   str(self.auth_token))
-        url = '%sgroups/%s' % (URL , 'global_group_bad')
+        url = '%sgroups/%s' % (URL, 'global_group_bad')
         #test for Content-Type = application/json
         resp, content = h.request(url, "GET", body='',
                                   headers={"Content-Type": "application/xml",
@@ -409,7 +408,6 @@ class get_global_group_test(global_group_test):
             self.fail('Service Not Available')
         self.assertEqual(404, int(resp['status']))
 
-    
 
 class update_global_groups_test(global_group_test):
 
@@ -437,7 +435,7 @@ class update_global_groups_test(global_group_test):
         h = httplib2.Http(".cache")
         respG, contentG = create_global_group(self.global_group,
                                                   str(self.auth_token))
-        
+
         url = '%sgroups/%s' % (URL, self.global_group)
         data = u'<?xml version="1.0" encoding="UTF-8"?> \
                 <group xmlns="http://docs.openstack.org/idm/api/v1.0" \
@@ -448,7 +446,7 @@ class update_global_groups_test(global_group_test):
                                   headers={"Content-Type": "application/xml",
                                            "X-Auth-Token": self.auth_token,
                                            "ACCEPT": "application/xml"})
-        
+
         body = etree.fromstring(content)
         desc = body.find("{http://docs.openstack.org/idm/api/v1.0}description")
         if int(resp['status']) == 500:
@@ -568,11 +566,9 @@ class delete_global_group_test(global_group_test):
                                           str(self.auth_token))
         self.assertEqual(204, int(resp['status']))
 
-   
-
 
 class add_user_global_group_test(unittest.TestCase):
-    
+
     def setUp(self):
         self.token = get_token('joeuser', 'secrete', 'token')
         self.tenant = get_global_tenant()
@@ -582,21 +578,17 @@ class add_user_global_group_test(unittest.TestCase):
         self.exp_auth_token = get_exp_auth_token()
         self.disabled_token = get_disabled_token()
         self.global_group = 'test_global_group'
-        
-        
 
     def tearDown(self):
         respG, contentG = delete_user_global_group(self.global_group,
                                                    self.user,
                                                    str(self.auth_token))
-        
+
         respG, contentG = delete_user(self.tenant, self.user,
                                       str(self.auth_token))
         resp, content = delete_global_group(self.global_group,
                                             self.auth_token)
-        
-        
-        
+
     def test_add_user_global_group(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -604,17 +596,16 @@ class add_user_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, str(self.auth_token)
-                                                )
-        
+                                                self.user,
+                                                str(self.auth_token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         if int(respG['status']) not in (200, 201):
             self.fail('Failed due to %d' % int(respG['status']))
-        
-    
+
     def test_add_user_global_group_xml(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -622,18 +613,16 @@ class add_user_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group_xml(self.global_group,
-                                                self.user, str(self.auth_token)
-                                                )
-        
-        
+                                                self.user,
+                                                str(self.auth_token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         if int(respG['status']) not in (200, 201):
             self.fail('Failed due to %d' % int(respG['status']))
-        
-    
+
     def test_add_user_global_group_conflict(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -641,19 +630,18 @@ class add_user_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, str(self.auth_token)
-                                                )
+                                                self.user,
+                                                str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, str(self.auth_token)
-                                                )
-        
-        
+                                                self.user,
+                                                str(self.auth_token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(409, int(respG['status']))
-    
+
     def test_add_user_global_group_conflict_xml(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -661,18 +649,18 @@ class add_user_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group_xml(self.global_group,
-                                                self.user, str(self.auth_token)
-                                                )
+                                                self.user,
+                                                str(self.auth_token))
         respG, contentG = add_user_global_group_xml(self.global_group,
-                                                self.user, str(self.auth_token)
-                                                )
-        
+                                                self.user,
+                                                str(self.auth_token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(409, int(respG['status']))
-        
+
     def test_add_user_global_group_unauthorized(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -680,16 +668,15 @@ class add_user_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, str(self.token)
-                                                )
-        
-        
+                                                self.user,
+                                                str(self.token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(401, int(respG['status']))
-        
+
     def test_add_user_global_group_unauthorized_xml(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -697,15 +684,15 @@ class add_user_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group_xml(self.global_group,
-                                                self.user, str(self.token)
-                                                )
-        
+                                                    self.user,
+                                                    str(self.token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(401, int(respG['status']))
-        
+
     def test_add_user_global_group_forbidden(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -713,16 +700,15 @@ class add_user_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.disabled_token)
-                                                )
-        
+                                                self.user,
+                                                str(self.disabled_token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(403, int(respG['status']))
-    
+
     def test_add_user_global_group_forbidden_xml(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -730,18 +716,17 @@ class add_user_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group_xml(self.global_group,
-                                                self.user, 
-                                                str(self.disabled_token)
-                                                )
+                                                self.user,
+                                                str(self.disabled_token))
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(403, int(respG['status']))
-    
+
 
 class get_users_tenant_group_test(unittest.TestCase):
-    
+
     def setUp(self):
         self.token = get_token('joeuser', 'secrete', 'token')
         self.tenant = get_global_tenant()
@@ -751,18 +736,17 @@ class get_users_tenant_group_test(unittest.TestCase):
         self.exp_auth_token = get_exp_auth_token()
         self.disabled_token = get_disabled_token()
         self.global_group = 'test_global_group'
-        
-        
 
     def tearDown(self):
         respG, contentG = delete_user_global_group(self.global_group,
                                                    self.user,
                                                    str(self.auth_token))
-        
+
         respG, contentG = delete_user(self.tenant, self.user,
                                       str(self.auth_token))
         resp, content = delete_global_group(self.global_group,
-                                            self.auth_token)       
+                                            self.auth_token)
+
     def test_get_users_global_group(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -770,20 +754,17 @@ class get_users_tenant_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.auth_token)
-                                                )
+                                                self.user,
+                                                str(self.auth_token))
         respG, contentG = get_user_global_group(self.global_group,
-                                                str(self.auth_token)
-                                                )
-        
+                                                str(self.auth_token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(200, int(respG['status']))
-        
-    
+
     def test_get_users_global_group_xml(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -791,19 +772,16 @@ class get_users_tenant_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group_xml(self.global_group,
-                                                self.user, 
-                                                str(self.auth_token)
-                                                )
+                                                self.user,
+                                                str(self.auth_token))
         respG, contentG = get_user_global_group_xml(self.global_group,
-                                                str(self.auth_token)
-                                                )
+                                                str(self.auth_token))
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(200, int(respG['status']))
-        
-        
+
     def test_get_users_global_group_unauthorized(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -811,20 +789,18 @@ class get_users_tenant_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.auth_token)
-                                                )
-        
+                                                self.user,
+                                                str(self.auth_token))
+
         respG, contentG = get_user_global_group(self.global_group,
-                                                str(self.token)
-                                                )
-        
+                                                str(self.token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(401, int(respG['status']))
-        
+
     def test_get_users_global_group_unauthorized_xml(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -832,19 +808,17 @@ class get_users_tenant_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.auth_token)
-                                                )
+                                                self.user,
+                                                str(self.auth_token))
         respG, contentG = get_user_global_group_xml(self.global_group,
-                                                str(self.token)
-                                                )
-        
+                                                str(self.token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(401, int(respG['status']))
-        
+
     def test_get_users_global_group_forbidden(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -852,19 +826,17 @@ class get_users_tenant_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.auth_token)
-                                                )
+                                                self.user,
+                                                str(self.auth_token))
         respG, contentG = get_user_global_group(self.global_group,
-                                                str(self.disabled_token)
-                                                )
-        
+                                                str(self.disabled_token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(403, int(respG['status']))
-    
+
     def test_get_users_global_group_forbidden_xml(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -872,18 +844,16 @@ class get_users_tenant_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.auth_token)
-                                                )
+                                                self.user,
+                                                str(self.auth_token))
         respG, contentG = get_user_global_group_xml(self.global_group,
-                                                str(self.disabled_token)
-                                                )
+                                                str(self.disabled_token))
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(403, int(respG['status']))
-    
+
     def test_get_users_global_group_expired(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -891,19 +861,17 @@ class get_users_tenant_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.auth_token)
-                                                )
+                                                self.user,
+                                                str(self.auth_token))
         respG, contentG = get_user_global_group(self.global_group,
-                                                str(self.exp_auth_token)
-                                                )
-        
+                                                str(self.exp_auth_token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(403, int(respG['status']))
-    
+
     def test_get_users_global_group_expired_xml(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -911,20 +879,19 @@ class get_users_tenant_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.auth_token)
-                                                )
+                                                self.user,
+                                                str(self.auth_token))
         respG, contentG = get_user_global_group_xml(self.global_group,
-                                                str(self.exp_auth_token)
-                                                )
+                                                str(self.exp_auth_token))
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(403, int(respG['status']))
-    
-class delete_users_global_group_test(unittest.TestCase):  
-    
+
+
+class delete_users_global_group_test(unittest.TestCase):
+
     def setUp(self):
         self.token = get_token('joeuser', 'secrete', 'token')
         self.tenant = get_global_tenant()
@@ -934,18 +901,17 @@ class delete_users_global_group_test(unittest.TestCase):
         self.exp_auth_token = get_exp_auth_token()
         self.disabled_token = get_disabled_token()
         self.global_group = 'test_global_group'
-        
-        
 
     def tearDown(self):
         respG, contentG = delete_user_global_group(self.global_group,
                                                    self.user,
                                                    str(self.auth_token))
-        
+
         respG, contentG = delete_user(self.tenant, self.user,
                                       str(self.auth_token))
         resp, content = delete_global_group(self.global_group,
                                             self.auth_token)
+
     def test_delete_user_global_group(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -953,22 +919,19 @@ class delete_users_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.auth_token)
-                                                )
-        
+                                                self.user,
+                                                str(self.auth_token))
+
         respG, contentG = delete_user_global_group(self.global_group,
-                                                   self.user, 
-                                                   str(self.auth_token)
-                                                )
-        
+                                                   self.user,
+                                                   str(self.auth_token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(204, int(respG['status']))
-        
-    
+
     def test_delete_user_global_group_xml(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -976,19 +939,17 @@ class delete_users_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.auth_token)
-                                                )
+                                                self.user,
+                                                str(self.auth_token))
         respG, contentG = delete_user_global_group_xml(self.global_group,
-                                                   self.user, 
-                                                   str(self.auth_token)
-                                                )
+                                                   self.user,
+                                                   str(self.auth_token))
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(204, int(respG['status']))
-    
+
     def test_delete_user_global_group_notfound(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -996,23 +957,20 @@ class delete_users_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.disabled_token)
-                                                )
+                                                self.user,
+                                                str(self.disabled_token))
         respG, contentG = delete_user_global_group(self.global_group,
-                                                   self.user, 
-                                                   str(self.auth_token)
-                                                )
+                                                   self.user,
+                                                   str(self.auth_token))
         respG, contentG = delete_user_global_group(self.global_group,
-                                                   self.user, 
-                                                   str(self.auth_token)
-                                                )
+                                                   self.user,
+                                                   str(self.auth_token))
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(404, int(respG['status']))
-        
+
     def test_delete_user_global_group_notfound_xml(self):
         h = httplib2.Http(".cache")
         resp, content = create_global_group(self.global_group,
@@ -1020,22 +978,19 @@ class delete_users_global_group_test(unittest.TestCase):
         respG, contentG = create_user(self.tenant, self.user,
                                       str(self.auth_token))
         respG, contentG = add_user_global_group(self.global_group,
-                                                self.user, 
-                                                str(self.disabled_token)
-                                                )
+                                                self.user,
+                                                str(self.disabled_token))
         respG, contentG = delete_user_global_group(self.global_group,
-                                                   self.user, 
-                                                   str(self.auth_token)
-                                                )
+                                                   self.user,
+                                                   str(self.auth_token))
         respG, contentG = delete_user_global_group_xml(self.global_group,
-                                                   self.user, 
-                                                   str(self.auth_token)
-                                                )
-        
+                                                   self.user,
+                                                   str(self.auth_token))
+
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
             self.fail('Service Not Available')
         self.assertEqual(404, int(respG['status']))
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/test/unit/test_identity.py b/test/unit/test_identity.py
index 31b6ae32..400f6cc5 100644
--- a/test/unit/test_identity.py
+++ b/test/unit/test_identity.py
@@ -5,6 +5,7 @@ import unittest
 
 MODULE_EXTENSIONS = set('.py .pyc .pyo'.split())
 
+
 def unit_test_extractor(tup, path, filenames):
     """Pull ``unittest.TestSuite``s from modules in path
     if the path represents a valid Python package. Accumulate
@@ -16,16 +17,16 @@ def unit_test_extractor(tup, path, filenames):
     relpath = os.path.relpath(path, package_path)
     relpath_pieces = relpath.split(os.sep)
 
-    if relpath_pieces[0] == '.': # Base directory.
-        relpath_pieces.pop(0) # Otherwise, screws up module name.
+    if relpath_pieces[0] == '.':  # Base directory.
+        relpath_pieces.pop(0)  # Otherwise, screws up module name.
     elif not any(os.path.exists(os.path.join(path, '__init__' + ext))
             for ext in MODULE_EXTENSIONS):
-        return # Not a package directory and not the base directory, reject.
+        return  # Not a package directory and not the base directory, reject.
 
     logging.info('Base: %s', '.'.join(relpath_pieces))
     for filename in filenames:
         base, ext = os.path.splitext(filename)
-        if ext not in MODULE_EXTENSIONS: # Not a Python module.
+        if ext not in MODULE_EXTENSIONS:  # Not a Python module.
             continue
         logging.info('Module: %s', base)
         module_name = '.'.join(relpath_pieces + [base])
@@ -35,6 +36,7 @@ def unit_test_extractor(tup, path, filenames):
         logging.info('Got suites: %s', module_suites)
         suites += module_suites
 
+
 def get_test_suites(path):
     """:return: Iterable of suites for the packages/modules
     present under :param:`path`.
@@ -51,4 +53,3 @@ if __name__ == '__main__':
     suites = get_test_suites(package_path)
     for suite in suites:
         unittest.TextTestRunner(verbosity=2).run(suite)
-
diff --git a/test/unit/test_tenants.py b/test/unit/test_tenants.py
index a4713c52..bb54ef1e 100644
--- a/test/unit/test_tenants.py
+++ b/test/unit/test_tenants.py
@@ -12,6 +12,7 @@ import unittest
 from webtest import TestApp
 from test_common import *
 
+
 class tenant_test(unittest.TestCase):
 
     def setUp(self):
@@ -25,10 +26,10 @@ class tenant_test(unittest.TestCase):
 
     def tearDown(self):
         resp, content = delete_tenant(self.tenant, self.auth_token)
-        
+
 
 class create_tenant_test(tenant_test):
-     
+
     def test_tenant_create(self):
         resp, content = delete_tenant('test_tenant', str(self.auth_token))
         resp, content = create_tenant('test_tenant', str(self.auth_token))
@@ -231,8 +232,8 @@ class create_tenant_test(tenant_test):
                 :true  } }' % self.tenant
         resp, content = h.request(url, "POST", body=body,
                                   headers={"Content-Type": "application/json",
-                                           "X-Auth-Token": self.disabled_token
-                                           })
+                                           "X-Auth-Token": \
+                                                   self.disabled_token})
 
         if int(resp['status']) == 500:
             self.fail('IDM fault')
@@ -318,8 +319,8 @@ class get_tenants_test(tenant_test):
         #test for Content-Type = application/json
         resp, content = h.request(url, "GET", body='{}',
                                   headers={"Content-Type": "application/json",
-                                           "X-Auth-Token": self.auth_token
-                                           })
+                                           "X-Auth-Token": \
+                                                   self.auth_token})
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
@@ -377,8 +378,8 @@ class get_tenants_test(tenant_test):
         #test for Content-Type = application/json
         resp, content = h.request(url, "GET", body='{}',
                                   headers={"Content-Type": "application/json",
-                                           "X-Auth-Token": self.exp_auth_token
-                                           })
+                                           "X-Auth-Token": \
+                                                   self.exp_auth_token})
         if int(resp['status']) == 500:
             self.fail('IDM fault')
         elif int(resp['status']) == 503:
@@ -640,4 +641,4 @@ class delete_tenant_test(tenant_test):
         self.assertEqual(204, int(resp['status']))
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()