Merge branch 'master' of https://git.hcleai.com/keystone

8 files changed, 8 insertions, 26 deletions

diff --git a/test/unit/test_authentication.py b/test/unit/test_authentication.py
index 209c403e..78bf0486 100644
--- a/test/unit/test_authentication.py
+++ b/test/unit/test_authentication.py
@@ -33,7 +33,7 @@ class authentication_test(unittest.TestCase):
 
     def test_a_authorize_xml(self):
         resp, content = utils.get_token_xml('joeuser', 'secrete', '',
-                                            self.tenant)
+                                             self.tenant)
         self.assertEqual(200, int(resp['status']))
         self.assertEqual('application/xml', utils.content_type(resp))
 
@@ -105,9 +105,5 @@ class authentication_test(unittest.TestCase):
         self.assertEqual(400, int(resp['status']))
         self.assertEqual('application/xml', utils.content_type(resp))
 
-
-def run():
-    unittest.main()
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/unit/test_groups.py b/test/unit/test_groups.py
index 5696c803..1ca4dff3 100644
--- a/test/unit/test_groups.py
+++ b/test/unit/test_groups.py
@@ -995,9 +995,5 @@ class delete_users_global_group_test(unittest.TestCase):
             self.fail('Service Not Available')
         self.assertEqual(404, int(respG['status']))
 
-
-def run():
-    unittest.main()
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/unit/test_keystone.py b/test/unit/test_keystone.py
index 0301bf82..9a6fe4df 100644
--- a/test/unit/test_keystone.py
+++ b/test/unit/test_keystone.py
@@ -3,7 +3,9 @@ import os
 import unittest
 from lxml import etree
 MODULE_EXTENSIONS = set('.py'.split())
-
+TEST_FILES = ['test_authentication.py', 'test_keystone.py', 'test_tenants.py',
+              'test_common.py', 'test_users.py','test_tenant_groups.py',
+              'test_token.py', 'test_version.py', 'test_groups.py']
 
 def unit_test_extractor(tup, path, filenames):
     """Pull ``unittest.TestSuite``s from modules in path
@@ -24,9 +26,11 @@ def unit_test_extractor(tup, path, filenames):
 
     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 filename not in TEST_FILES:
             continue
+        base, ext = os.path.splitext(filename)
+        #if ext not in MODULE_EXTENSIONS  :  # Not a Python module.
+        #    continue
         logging.info('Module: %s', base)
         module_name = '.'.join(relpath_pieces + [base])
         logging.info('Importing from %s', module_name)
diff --git a/test/unit/test_tenant_groups.py b/test/unit/test_tenant_groups.py
index 5b6ed725..9c46db42 100644
--- a/test/unit/test_tenant_groups.py
+++ b/test/unit/test_tenant_groups.py
@@ -1191,9 +1191,5 @@ class delete_users_tenant_group_test(tenant_group_test):
             self.fail('Service Not Available')
         self.assertEqual(404, int(resp['status']))
 
-
-def run():
-    unittest.main()
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/unit/test_tenants.py b/test/unit/test_tenants.py
index c91e9395..0489c195 100644
--- a/test/unit/test_tenants.py
+++ b/test/unit/test_tenants.py
@@ -633,9 +633,5 @@ class delete_tenant_test(tenant_test):
                                           str(self.auth_token))
         self.assertEqual(204, int(resp['status']))
 
-
-def run():
-    unittest.main()
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/unit/test_token.py b/test/unit/test_token.py
index bc61c5ad..ce33c8f1 100644
--- a/test/unit/test_token.py
+++ b/test/unit/test_token.py
@@ -109,6 +109,5 @@ class validate_token(unittest.TestCase):
         self.assertEqual(401, int(resp['status']))
         self.assertEqual('application/json', utils.content_type(resp))
 
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/unit/test_users.py b/test/unit/test_users.py
index 2825ce7c..069b4055 100644
--- a/test/unit/test_users.py
+++ b/test/unit/test_users.py
@@ -1637,9 +1637,5 @@ class set_enabled_test(user_test):
         self.assertEqual(401, resp_val)
         self.assertEqual('application/xml', content_type(resp))
 
-
-def run():
-    unittest.main()
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/unit/test_version.py b/test/unit/test_version.py
index 407c11ef..76b013ab 100644
--- a/test/unit/test_version.py
+++ b/test/unit/test_version.py
@@ -28,6 +28,5 @@ class version_test(unittest.TestCase):
         self.assertEqual(200, int(resp['status']))
         self.assertEqual('application/xml', utils.content_type(resp))
 
-
 if __name__ == '__main__':
     unittest.main()