From 6457b72ed03970c0fbd3b8000fa4619d8964edcd Mon Sep 17 00:00:00 2001 From: "sirish.bitra" Date: Thu, 12 May 2011 19:01:57 +0530 Subject: removed unused run method --- test/unit/test_authentication.py | 6 ++---- test/unit/test_groups.py | 3 --- test/unit/test_tenant_groups.py | 3 --- test/unit/test_tenants.py | 3 --- test/unit/test_token.py | 1 - test/unit/test_users.py | 3 --- test/unit/test_version.py | 2 -- 7 files changed, 2 insertions(+), 19 deletions(-) (limited to 'test') diff --git a/test/unit/test_authentication.py b/test/unit/test_authentication.py index 9f82ad41..68c25969 100644 --- a/test/unit/test_authentication.py +++ b/test/unit/test_authentication.py @@ -31,7 +31,8 @@ class authentication_test(unittest.TestCase): self.assertEqual('application/json', utils.content_type(resp)) def test_a_authorize_xml(self): - resp, content = utils.get_token_xml('joeuser', 'secrete', '', self.tenant) + resp, content = utils.get_token_xml('joeuser', 'secrete', '', + self.tenant) self.assertEqual(200, int(resp['status'])) self.assertEqual('application/xml', utils.content_type(resp)) @@ -103,8 +104,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 3113687f..e49f062d 100644 --- a/test/unit/test_groups.py +++ b/test/unit/test_groups.py @@ -992,8 +992,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_tenant_groups.py b/test/unit/test_tenant_groups.py index 6634b280..b9fdfefb 100644 --- a/test/unit/test_tenant_groups.py +++ b/test/unit/test_tenant_groups.py @@ -1201,8 +1201,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 103dd578..435a229b 100644 --- a/test/unit/test_tenants.py +++ b/test/unit/test_tenants.py @@ -634,8 +634,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 9177e87a..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 49318b95..3913c7f9 100644 --- a/test/unit/test_users.py +++ b/test/unit/test_users.py @@ -1636,8 +1636,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 462a796a..31ca7810 100644 --- a/test/unit/test_version.py +++ b/test/unit/test_version.py @@ -27,7 +27,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() -- cgit From 3c018e49ea1ed883b114fddc8a9d6fcd15456761 Mon Sep 17 00:00:00 2001 From: "sirish.bitra" Date: Thu, 12 May 2011 19:23:24 +0530 Subject: fixed bug raised when included exthandler --- test/unit/test_keystone.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'test') 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) -- cgit