From dcedc4d40147a018cbd39fa5a6d1cac8cf0815b6 Mon Sep 17 00:00:00 2001 From: Ramana Juvvadi Date: Wed, 11 May 2011 08:51:00 -0500 Subject: renamed test_identity.py to test_keystone --- test/unit/test_common.py | 1 - test/unit/test_identity.py | 54 ---------------------------------------------- test/unit/test_keystone.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 55 deletions(-) delete mode 100644 test/unit/test_identity.py create mode 100644 test/unit/test_keystone.py (limited to 'test') diff --git a/test/unit/test_common.py b/test/unit/test_common.py index d9bc7b40..6bb86542 100644 --- a/test/unit/test_common.py +++ b/test/unit/test_common.py @@ -258,7 +258,6 @@ def delete_user_xml(tenantid, userid, auth_token): 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) - print url resp, content = h.request(url, "PUT", body='', headers={"Content-Type": "application/json", diff --git a/test/unit/test_identity.py b/test/unit/test_identity.py deleted file mode 100644 index 31b6ae32..00000000 --- a/test/unit/test_identity.py +++ /dev/null @@ -1,54 +0,0 @@ -#TODO (India Team) Need to modify this script -import logging -import os -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 - results in `tup[1]`. - """ - package_path, suites = tup - logging.debug('Path: %s', path) - logging.debug('Filenames: %s', 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. - 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. - - 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. - continue - logging.info('Module: %s', base) - module_name = '.'.join(relpath_pieces + [base]) - logging.info('Importing from %s', module_name) - module = __import__(module_name) - module_suites = unittest.defaultTestLoader.loadTestsFromModule(module) - 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`. - """ - logging.info('Base path: %s', package_path) - suites = [] - os.path.walk(package_path, unit_test_extractor, (package_path, suites)) - logging.info('Got suites: %s', suites) - return suites - -if __name__ == '__main__': - logging.basicConfig(level=logging.WARN) - package_path = os.path.dirname(os.path.abspath(__file__)) - suites = get_test_suites(package_path) - for suite in suites: - unittest.TextTestRunner(verbosity=2).run(suite) - diff --git a/test/unit/test_keystone.py b/test/unit/test_keystone.py new file mode 100644 index 00000000..31b6ae32 --- /dev/null +++ b/test/unit/test_keystone.py @@ -0,0 +1,54 @@ +#TODO (India Team) Need to modify this script +import logging +import os +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 + results in `tup[1]`. + """ + package_path, suites = tup + logging.debug('Path: %s', path) + logging.debug('Filenames: %s', 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. + 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. + + 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. + continue + logging.info('Module: %s', base) + module_name = '.'.join(relpath_pieces + [base]) + logging.info('Importing from %s', module_name) + module = __import__(module_name) + module_suites = unittest.defaultTestLoader.loadTestsFromModule(module) + 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`. + """ + logging.info('Base path: %s', package_path) + suites = [] + os.path.walk(package_path, unit_test_extractor, (package_path, suites)) + logging.info('Got suites: %s', suites) + return suites + +if __name__ == '__main__': + logging.basicConfig(level=logging.WARN) + package_path = os.path.dirname(os.path.abspath(__file__)) + suites = get_test_suites(package_path) + for suite in suites: + unittest.TextTestRunner(verbosity=2).run(suite) + -- cgit From 81ea90027fda08b60ed20aa0bfa7873bbcdaa972 Mon Sep 17 00:00:00 2001 From: Adipudi Praveena Date: Wed, 11 May 2011 20:09:22 +0530 Subject: PEP8 for test cases by praveena --- test/unit/test_authentication.py | 2 +- test/unit/test_common.py | 72 ++++++---- test/unit/test_groups.py | 299 +++++++++++++++++---------------------- test/unit/test_identity.py | 11 +- test/unit/test_tenants.py | 19 +-- 5 files changed, 190 insertions(+), 213 deletions(-) (limited to 'test') 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' \ Date: Wed, 11 May 2011 20:22:18 +0530 Subject: Added PEP8 for remaining test cases --- test/unit/test_tenant_groups.py | 101 ++++++------- test/unit/test_tenants.py | 16 +- test/unit/test_token.py | 3 +- test/unit/test_users.py | 321 ++++++++++++++++++++-------------------- test/unit/test_version.py | 5 +- 5 files changed, 212 insertions(+), 234 deletions(-) (limited to 'test') diff --git a/test/unit/test_tenant_groups.py b/test/unit/test_tenant_groups.py index f15bd909..3a0b9369 100644 --- a/test/unit/test_tenant_groups.py +++ b/test/unit/test_tenant_groups.py @@ -13,7 +13,6 @@ from webtest import TestApp from test_common import * - class tenant_group_test(unittest.TestCase): def setUp(self): @@ -211,7 +210,6 @@ class create_tenant_group_test(tenant_group_test): self.fail('Service Not Available') self.assertEqual(401, int(resp['status'])) - def test_tenant_group_create_missing_token_xml(self): h = httplib2.Http(".cache") resp, content = create_tenant_xml(self.tenant, str(self.auth_token)) @@ -233,7 +231,6 @@ class create_tenant_group_test(tenant_group_test): self.fail('Service Not Available') self.assertEqual(401, int(resp['status'])) - def test_tenant_group_create_disabled_token(self): h = httplib2.Http(".cache") resp, content = create_tenant(self.tenant, str(self.auth_token)) @@ -245,7 +242,7 @@ class create_tenant_group_test(tenant_group_test): "description": "A description ..." } }' % self.tenant_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') @@ -405,7 +402,7 @@ class get_tenant_groups_test(tenant_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: @@ -516,9 +513,9 @@ class get_tenant_group_test(tenant_group_test): headers={"Content-Type": "application/json", "X-Auth-Token": self.auth_token}) if int(resp['status']) == 500: - self.fail('IDM fault') + self.fail('IDM fault') elif int(resp['status']) == 503: - self.fail('Service Not Available') + self.fail('Service Not Available') self.assertEqual(404, int(resp['status'])) def test_get_tenant_group_not_found_xml(self): @@ -586,7 +583,7 @@ class update_tenant_group_test(tenant_group_test): self.tenant, str(self.auth_token)) - url = '%stenant/%s/groups/%s' % (URL, self.tenant , self.tenant_group) + url = '%stenant/%s/groups/%s' % (URL, self.tenant, self.tenant_group) data = ' \ @@ -773,7 +770,6 @@ class add_user_tenant_group_test(tenant_group_test): self.auth_token) resp, content = delete_tenant(self.tenant, self.auth_token) - def test_add_user_tenant_group(self): h = httplib2.Http(".cache") resp, content = create_tenant(self.tenant, str(self.auth_token)) @@ -785,8 +781,7 @@ class add_user_tenant_group_test(tenant_group_test): respG, contentG = create_user(self.tenant, self.user, str(self.auth_token)) respG, contentG = add_user_tenant_group(self.tenant, self.tenant_group, - self.user, str(self.auth_token) - ) + self.user, str(self.auth_token)) if int(resp['status']) == 500: self.fail('IDM fault') @@ -795,7 +790,6 @@ class add_user_tenant_group_test(tenant_group_test): if int(respG['status']) not in (200, 201): self.fail('Failed due to %d' % int(respG['status'])) - def test_add_user_tenant_group_xml(self): h = httplib2.Http(".cache") resp, content = create_tenant(self.tenant, str(self.auth_token)) @@ -816,7 +810,6 @@ class add_user_tenant_group_test(tenant_group_test): if int(respG['status']) not in (200, 201): self.fail('Failed due to %d' % int(respG['status'])) - def test_add_user_tenant_group_conflict(self): h = httplib2.Http(".cache") resp, content = create_tenant(self.tenant, str(self.auth_token)) @@ -826,12 +819,9 @@ class add_user_tenant_group_test(tenant_group_test): respG, contentG = create_user(self.tenant, self.user, str(self.auth_token)) respG, contentG = add_user_tenant_group(self.tenant, self.tenant_group, - self.user, str(self.auth_token) - ) + self.user, str(self.auth_token)) respG, contentG = add_user_tenant_group(self.tenant, self.tenant_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: @@ -846,12 +836,13 @@ class add_user_tenant_group_test(tenant_group_test): str(self.auth_token)) respG, contentG = create_user(self.tenant, self.user, str(self.auth_token)) - respG, contentG = add_user_tenant_group_xml(self.tenant, self.tenant_group, - self.user, str(self.auth_token) - ) - respG, contentG = add_user_tenant_group_xml(self.tenant, self.tenant_group, - self.user, str(self.auth_token) - ) + respG, contentG = add_user_tenant_group_xml(self.tenant, + self.tenant_group, + self.user, str(self.auth_token)) + respG, contentG = add_user_tenant_group_xml(self.tenant, + self.tenant_group, + self.user, + str(self.auth_token)) if int(resp['status']) == 500: self.fail('IDM fault') @@ -886,7 +877,8 @@ class add_user_tenant_group_test(tenant_group_test): respG, contentG = create_user(self.tenant, self.user, str(self.auth_token)) - respG, contentG = add_user_tenant_group_xml(self.tenant, self.tenant_group, + respG, contentG = add_user_tenant_group_xml(self.tenant, + self.tenant_group, self.user, self.token) if int(resp['status']) == 500: @@ -922,8 +914,10 @@ class add_user_tenant_group_test(tenant_group_test): respG, contentG = create_user(self.tenant, self.user, str(self.auth_token)) - respG, contentG = add_user_tenant_group_xml(self.tenant, self.tenant_group, - self.user, self.disabled_token) + respG, contentG = add_user_tenant_group_xml(self.tenant, + self.tenant_group, + self.user, + self.disabled_token) if int(resp['status']) == 500: self.fail('IDM fault') @@ -967,11 +961,9 @@ class get_users_tenant_group_test(tenant_group_test): respG, contentG = create_user(self.tenant, self.user, str(self.auth_token)) respG, contentG = add_user_tenant_group(self.tenant, self.tenant_group, - self.user, str(self.auth_token) - ) + self.user, str(self.auth_token)) respG, contentG = get_user_tenant_group(self.tenant, self.tenant_group, - str(self.auth_token) - ) + str(self.auth_token)) if int(resp['status']) == 500: self.fail('IDM fault') @@ -979,7 +971,6 @@ class get_users_tenant_group_test(tenant_group_test): self.fail('Service Not Available') self.assertEqual(200, int(respG['status'])) - def test_get_users_tenant_group_xml(self): h = httplib2.Http(".cache") resp, content = create_tenant(self.tenant, str(self.auth_token)) @@ -994,15 +985,13 @@ class get_users_tenant_group_test(tenant_group_test): str(self.auth_token)) respG, contentG = get_user_tenant_group_xml(self.tenant, self.tenant_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_tenant_group_unauthorized(self): h = httplib2.Http(".cache") resp, content = create_tenant(self.tenant, str(self.auth_token)) @@ -1012,12 +1001,13 @@ class get_users_tenant_group_test(tenant_group_test): respG, contentG = create_user(self.tenant, self.user, str(self.auth_token)) - respG, contentG = add_user_tenant_group(self.tenant, self.tenant_group, - self.user, self.auth_token) + respG, contentG = add_user_tenant_group(self.tenant, + self.tenant_group, + self.user, + self.auth_token) respG, contentG = get_user_tenant_group(self.tenant, self.tenant_group, - str(self.token) - ) + str(self.token)) if int(resp['status']) == 500: self.fail('IDM fault') @@ -1038,8 +1028,7 @@ class get_users_tenant_group_test(tenant_group_test): self.user, self.auth_token) respG, contentG = get_user_tenant_group_xml(self.tenant, self.tenant_group, - str(self.token) - ) + str(self.token)) if int(resp['status']) == 500: self.fail('IDM fault') @@ -1060,8 +1049,7 @@ class get_users_tenant_group_test(tenant_group_test): self.user, self.auth_token) respG, contentG = get_user_tenant_group(self.tenant, self.tenant_group, - str(self.disabled_token) - ) + str(self.disabled_token)) if int(resp['status']) == 500: self.fail('IDM fault') @@ -1082,8 +1070,7 @@ class get_users_tenant_group_test(tenant_group_test): self.user, self.auth_token) respG, contentG = get_user_tenant_group_xml(self.tenant, self.tenant_group, - str(self.disabled_token) - ) + str(self.disabled_token)) if int(resp['status']) == 500: self.fail('IDM fault') elif int(resp['status']) == 503: @@ -1102,8 +1089,7 @@ class get_users_tenant_group_test(tenant_group_test): respG, contentG = add_user_tenant_group(self.tenant, self.tenant_group, self.user, self.auth_token) respG, contentG = get_user_tenant_group(self.tenant, self.tenant_group, - str(self.exp_auth_token) - ) + str(self.exp_auth_token)) if int(resp['status']) == 500: self.fail('IDM fault') @@ -1124,14 +1110,14 @@ class get_users_tenant_group_test(tenant_group_test): self.user, self.auth_token) respG, contentG = get_user_tenant_group_xml(self.tenant, self.tenant_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_tenant_group_test(tenant_group_test): def test_delete_user_tenant_group(self): @@ -1142,14 +1128,14 @@ class delete_users_tenant_group_test(tenant_group_test): str(self.auth_token)) respG, contentG = create_user(self.tenant, self.user, str(self.auth_token)) - respG, contentG = add_user_tenant_group(self.tenant, self.tenant_group, - self.user, str(self.auth_token) - ) + respG, contentG = add_user_tenant_group(self.tenant, + self.tenant_group, + self.user, + str(self.auth_token)) respG, contentG = delete_user_tenant_group(self.tenant, self.tenant_group, self.user, - str(self.auth_token) - ) + str(self.auth_token)) if int(resp['status']) == 500: self.fail('IDM fault') @@ -1157,7 +1143,6 @@ class delete_users_tenant_group_test(tenant_group_test): self.fail('Service Not Available') self.assertEqual(204, int(respG['status'])) - def test_delete_user_tenant_group_xml(self): h = httplib2.Http(".cache") resp, content = create_tenant(self.tenant, str(self.auth_token)) @@ -1187,8 +1172,7 @@ class delete_users_tenant_group_test(tenant_group_test): respG, contentG = delete_user_tenant_group(self.tenant, self.tenant_group, 'NonExistinguser', - str(self.auth_token) - ) + str(self.auth_token)) if int(respG['status']) == 500: self.fail('IDM fault') @@ -1202,8 +1186,7 @@ class delete_users_tenant_group_test(tenant_group_test): respG, contentG = delete_user_tenant_group_xml(self.tenant, self.tenant_group, 'NonExistinguser', - str(self.auth_token) - ) + str(self.auth_token)) if int(respG['status']) == 500: self.fail('IDM fault') diff --git a/test/unit/test_tenants.py b/test/unit/test_tenants.py index a4713c52..c2b41e25 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,7 @@ 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 +318,7 @@ 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 +376,7 @@ 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 +638,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() diff --git a/test/unit/test_token.py b/test/unit/test_token.py index c29061c2..622de6f0 100644 --- a/test/unit/test_token.py +++ b/test/unit/test_token.py @@ -61,8 +61,7 @@ class validate_token(unittest.TestCase): self.tenant) 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: diff --git a/test/unit/test_users.py b/test/unit/test_users.py index 31afe408..05a3e2ee 100644 --- a/test/unit/test_users.py +++ b/test/unit/test_users.py @@ -12,6 +12,7 @@ import unittest from webtest import TestApp from test_common import * + class user_test(unittest.TestCase): def setUp(self): @@ -29,89 +30,89 @@ class user_test(unittest.TestCase): def tearDown(self): - resp, content = delete_user(self.tenant, self.user, + resp, content = delete_user(self.tenant, self.user, str(self.auth_token)) class create_user_test(user_test): def test_a_user_create_json(self): - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) resp_val = int(resp['status']) - handle_user_resp(self,content, resp_val, content_type(resp)) - self.assertEqual(201,resp_val) + handle_user_resp(self, content, resp_val, content_type(resp)) + self.assertEqual(201, resp_val) def test_a_user_create_xml(self): - resp, content = delete_user_xml(self.tenant, self.user, + resp, content = delete_user_xml(self.tenant, self.user, str(self.auth_token)) - resp, content = create_user_xml(self.tenant, self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.auth_token)) resp_val = int(resp['status']) - handle_user_resp(self,content, resp_val, content_type(resp)) - - self.assertEqual(201,resp_val) + handle_user_resp(self, content, resp_val, content_type(resp)) + + self.assertEqual(201, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_a_user_create_json_disabled_tenant(self): - resp, content = create_user('0000', self.user, + resp, content = create_user('0000', self.user, str(self.auth_token)) resp_val = int(resp['status']) - handle_user_resp(self,content, resp_val, content_type(resp)) - self.assertEqual(403,resp_val) + handle_user_resp(self, content, resp_val, content_type(resp)) + self.assertEqual(403, resp_val) def test_a_user_create_json_disabled_tenant_xml(self): - resp, content = create_user_xml('0000', self.user, + resp, content = create_user_xml('0000', self.user, str(self.auth_token)) resp_val = int(resp['status']) - handle_user_resp(self,content, resp_val, content_type(resp)) - self.assertEqual(403,resp_val) + handle_user_resp(self, content, resp_val, content_type(resp)) + self.assertEqual(403, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_a_user_again_json(self): - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) resp_val = int(resp['status']) - handle_user_resp(self,content, resp_val, content_type(resp)) - resp, content = create_user(self.tenant, self.user, + handle_user_resp(self, content, resp_val, content_type(resp)) + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) self.assertEqual(409, int(resp['status'])) def test_a_user_again_xml(self): - resp, content = create_user_xml(self.tenant, self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.auth_token)) - resp, content = create_user_xml(self.tenant, self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.auth_token)) content = etree.fromstring(content) resp_val = int(resp['status']) - handle_user_resp(self,content, resp_val, content_type(resp)) + handle_user_resp(self, content, resp_val, content_type(resp)) self.assertEqual(409, int(resp['status'])) self.assertEqual('application/xml', content_type(resp)) def test_a_user_create_expired_token(self): - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.exp_auth_token)) resp_val = int(resp['status']) - handle_user_resp(self, content,resp_val, content_type(resp)) + handle_user_resp(self, content, resp_val, content_type(resp)) self.assertEqual(403, int(resp['status'])) def test_a_user_create_expired_token_xml(self): - resp, content = create_user_xml(self.tenant, self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.exp_auth_token)) resp_val = int(resp['status']) - handle_user_resp(self, content,resp_val, content_type(resp)) + handle_user_resp(self, content, resp_val, content_type(resp)) self.assertEqual(403, int(resp['status'])) self.assertEqual('application/xml', content_type(resp)) def test_a_user_create_disabled_token(self): - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.disabled_token)) resp_val = int(resp['status']) handle_user_resp(self, content, resp_val, content_type(resp)) self.assertEqual(403, int(resp['status'])) def test_a_user_create_disabled_token_xml(self): - resp, content = create_user_xml(self.tenant, self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.disabled_token)) resp_val = int(resp['status']) handle_user_resp(self, content, resp_val, content_type(resp)) @@ -119,14 +120,14 @@ class create_user_test(user_test): self.assertEqual('application/xml', content_type(resp)) def test_a_user_create_missing_token(self): - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.missing_token)) resp_val = int(resp['status']) handle_user_resp(self, content, resp_val, content_type(resp)) self.assertEqual(401, int(resp['status'])) def test_a_user_create_missing_token_xml(self): - resp, content = create_user_xml(self.tenant, self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.missing_token)) resp_val = int(resp['status']) handle_user_resp(self, content, resp_val, content_type(resp)) @@ -134,17 +135,17 @@ class create_user_test(user_test): self.assertEqual('application/xml', content_type(resp)) def test_a_user_create_invalid_token(self): - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.invalid_token)) resp_val = int(resp['status']) - handle_user_resp(self, content,resp_val, content_type(resp)) + handle_user_resp(self, content, resp_val, content_type(resp)) self.assertEqual(404, int(resp['status'])) def test_a_user_create_invalid_token_xml(self): - resp, content = create_user_xml(self.tenant, self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.invalid_token)) resp_val = int(resp['status']) - handle_user_resp(self, content,resp_val, content_type(resp)) + handle_user_resp(self, content, resp_val, content_type(resp)) self.assertEqual(404, int(resp['status'])) self.assertEqual('application/xml', content_type(resp)) @@ -153,12 +154,11 @@ class get_user_test(user_test): def test_a_user_get_json(self): h = httplib2.Http(".cache") - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) - #test for Content-Type = application/json resp, content = h.request(url, "GET", body='{}', - headers={"Content-Type": "application/json", + headers={"Content-Type": "application/json", "X-Auth-Token": self.auth_token}) resp_val = int(resp['status']) handle_user_resp(self, content, resp_val, content_type(resp)) @@ -166,7 +166,7 @@ class get_user_test(user_test): def test_a_user_get_xml(self): h = httplib2.Http(".cache") - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) resp, content = h.request(url, "GET", body='{}', @@ -180,21 +180,20 @@ class get_user_test(user_test): def test_a_user_get_expired_token(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #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}) resp_val = int(resp['status']) handle_user_resp(self, content, resp_val, content_type(resp)) - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) def test_a_user_get_expired_token_xml(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -209,21 +208,20 @@ class get_user_test(user_test): def test_a_user_get_disabled_token(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json resp, content = h.request(url, "GET", body='{}', headers={"Content-Type": "application/json", - "X-Auth-Token": self.disabled_token} - ) + "X-Auth-Token": self.disabled_token}) resp_val = int(resp['status']) handle_user_resp(self, content, resp_val, content_type(resp)) self.assertEqual(403, resp_val) def test_a_user_get_disabled_token_xml(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -251,7 +249,7 @@ class get_user_test(user_test): def test_a_user_get_missing_token_xml(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -261,12 +259,12 @@ class get_user_test(user_test): "ACCEPT": "application/xml"}) resp_val = int(resp['status']) handle_user_resp(self, content, resp_val, content_type(resp)) - self.assertEqual(401,resp_val) + self.assertEqual(401, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_a_user_get_invalid_token(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -275,11 +273,11 @@ class get_user_test(user_test): "X-Auth-Token": self.invalid_token}) resp_val = int(resp['status']) handle_user_resp(self, content, resp_val, content_type(resp)) - self.assertEqual(404,resp_val) + self.assertEqual(404, resp_val) def test_a_user_get_invalid_token_xml(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -294,7 +292,7 @@ class get_user_test(user_test): def test_a_user_get_disabled_user(self): h = httplib2.Http(".cache") - url = '%stenants/%s/users/%s' % (URL, self.tenant, + url = '%stenants/%s/users/%s' % (URL, self.tenant, self.userdisabled) #test for Content-Type = application/json resp, content = h.request(url, "GET", body='{}', @@ -308,7 +306,7 @@ class get_user_test(user_test): def test_a_user_get_disabled_user_xml(self): h = httplib2.Http(".cache") url = '%stenants/%s/users/%s' % (URL, self.tenant, self.userdisabled) - + resp, content = h.request(url, "GET", body='', headers={"Content-Type": "application/xml", "X-Auth-Token": self.auth_token, @@ -321,7 +319,7 @@ class get_user_test(user_test): def test_a_user_get_disabled_tenant(self): h = httplib2.Http(".cache") url = '%stenants/%s/users/%s' % (URL, '0000', self.userdisabled) - + resp, content = h.request(url, "GET", body='{}', headers={"Content-Type": "application/json", "X-Auth-Token": self.auth_token}) @@ -347,7 +345,7 @@ class delete_user_test(user_test): def test_a_user_delete_json(self): h = httplib2.Http(".cache") - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -363,7 +361,7 @@ class delete_user_test(user_test): def test_a_user_delete_xml(self): h = httplib2.Http(".cache") - resp, content = create_user_xml(self.tenant, self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) resp, content = h.request(url, "DELETE", body='{}', @@ -379,13 +377,13 @@ class delete_user_test(user_test): def test_a_user_delete_expired_token(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json resp, content = h.request(url, "DELETE", body='{}', headers={"Content-Type": "application/json", - "X-Auth-Token": self.exp_auth_token}) + "X-Auth-Token": self.exp_auth_token}) resp_val = int(resp['status']) if resp_val == 500: self.fail('IDM fault') @@ -395,7 +393,7 @@ class delete_user_test(user_test): def test_a_user_delete_expired_token_xml(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -413,7 +411,7 @@ class delete_user_test(user_test): def test_a_user_delete_missing_token(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -429,7 +427,7 @@ class delete_user_test(user_test): def test_a_user_delete_missing_token_xml(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -447,7 +445,7 @@ class delete_user_test(user_test): def test_a_user_delete_invalid_token(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -463,7 +461,7 @@ class delete_user_test(user_test): def test_a_user_delete_invalid_token_xml(self): h = httplib2.Http(".cache") - resp, content = create_user(self.user, self.tenant, + resp, content = create_user(self.user, self.tenant, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) #test for Content-Type = application/json @@ -511,6 +509,7 @@ class delete_user_test(user_test): self.assertEqual(403, resp_val) self.assertEqual('application/xml', content_type(resp)) + class get_users_test(user_test): def test_users_get_json(self): @@ -546,8 +545,7 @@ class get_users_test(user_test): url = '%stenants/%s/users' % (URL, self.tenant) 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}) resp_val = int(resp['status']) if resp_val == 500: self.fail('IDM fault') @@ -575,8 +573,7 @@ class get_users_test(user_test): url = '%stenants/%s/users' % (URL, self.tenant) resp, content = h.request(url, "GET", body='{}', headers={"Content-Type": "application/json", - "X-Auth-Token": self.disabled_token} - ) + "X-Auth-Token": self.disabled_token}) resp_val = int(resp['status']) if resp_val == 500: self.fail('IDM fault') @@ -642,7 +639,7 @@ class get_users_test(user_test): def test_users_get_invalid_token_xml(self): h = httplib2.Http(".cache") - url = '%stenants/%s/users' % (URL,self.tenant) + url = '%stenants/%s/users' % (URL, self.tenant) resp, content = h.request(url, "GET", body='{}', headers={"Content-Type": "application/xml", "X-Auth-Token": self.invalid_token, @@ -657,7 +654,7 @@ class get_users_test(user_test): def test_users_get_disabled_tenant_json(self): h = httplib2.Http(".cache") - url = '%stenants/%s/users' % (URL,"0000") + url = '%stenants/%s/users' % (URL, "0000") resp, content = h.request(url, "GET", body='{}', headers={"Content-Type": "application/json", "X-Auth-Token": self.auth_token}) @@ -666,12 +663,12 @@ class get_users_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - - self.assertEqual(403,resp_val) + + self.assertEqual(403, resp_val) def test_users_get_disabled_tenant_xml(self): h = httplib2.Http(".cache") - url = '%stenants/%s/users' % (URL,"0000") + url = '%stenants/%s/users' % (URL, "0000") resp, content = h.request(url, "GET", body='{}', headers={"Content-Type": "application/xml", "X-Auth-Token": self.auth_token, @@ -681,9 +678,10 @@ class get_users_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) self.assertEqual('application/xml', content_type(resp)) + class get_users_group_test(user_test): def test_users_group_get_json(self): @@ -697,7 +695,7 @@ class get_users_group_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(200,resp_val) + self.assertEqual(200, resp_val) def test_users_group_get_xml(self): h = httplib2.Http(".cache") @@ -711,7 +709,7 @@ class get_users_group_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(200,resp_val) + self.assertEqual(200, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_users_group_get_expired_token_json(self): @@ -719,13 +717,13 @@ class get_users_group_test(user_test): url = '%stenants/%s/users/%s/groups' % (URL, self.tenant, self.user) 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}) resp_val = int(resp['status']) if resp_val == 500: self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) def test_users_group_get_expired_token_xml(self): h = httplib2.Http(".cache") @@ -739,7 +737,7 @@ class get_users_group_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_users_group_get_disabled_token_json(self): @@ -747,14 +745,13 @@ class get_users_group_test(user_test): url = '%stenants/%s/users/%s/groups' % (URL, self.tenant, self.user) resp, content = h.request(url, "GET", body='{}', headers={"Content-Type": "application/json", - "X-Auth-Token": self.disabled_token} - ) + "X-Auth-Token": self.disabled_token}) resp_val = int(resp['status']) if resp_val == 500: self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) def test_users_group_get_disabled_token_xml(self): h = httplib2.Http(".cache") @@ -768,7 +765,7 @@ class get_users_group_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_users_group_get_missing_token_json(self): @@ -782,7 +779,7 @@ class get_users_group_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(401,resp_val) + self.assertEqual(401, resp_val) def test_users_group_get_missing_token_xml(self): h = httplib2.Http(".cache") @@ -796,7 +793,7 @@ class get_users_group_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(401,resp_val) + self.assertEqual(401, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_users_group_get_invalid_token_json(self): @@ -810,7 +807,7 @@ class get_users_group_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(404,resp_val) + self.assertEqual(404, resp_val) def test_users_group_get_invalid_token_xml(self): h = httplib2.Http(".cache") @@ -824,7 +821,7 @@ class get_users_group_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(404,resp_val) + self.assertEqual(404, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_users_group_get_disabled_tenant_json(self): @@ -838,8 +835,8 @@ class get_users_group_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - - self.assertEqual(403,resp_val) + + self.assertEqual(403, resp_val) def test_users_group_get_disabled_tenant_xml(self): h = httplib2.Http(".cache") @@ -853,38 +850,40 @@ class get_users_group_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) self.assertEqual('application/xml', content_type(resp)) + class update_user_test(user_test): def test_user_update_json(self): h = httplib2.Http(".cache") - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) - + url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) - + data = '{"user": { "email": "updatedjoeuser@rackspace.com"}}' resp, content = h.request(url, "PUT", body=data, headers={"Content-Type": "application/json", "X-Auth-Token": self.auth_token}) resp_val = int(resp['status']) - + content = json.loads(content) if resp_val == 500: self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - delete_user(self.tenant,self.user, str(self.auth_token)) - self.assertEqual(200,resp_val) - self.assertEqual('updatedjoeuser@rackspace.com',content['user']['email']) + delete_user(self.tenant, self.user, str(self.auth_token)) + self.assertEqual(200, resp_val) + self.assertEqual('updatedjoeuser@rackspace.com', \ + content['user']['email']) def test_user_update_xml(self): h = httplib2.Http(".cache") - resp, content = create_user_xml(self.tenant,self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.auth_token)) - url = '%stenants/%s/users/%s' % (URL,self.tenant,self.user) + url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) data = ' \ ' @@ -893,20 +892,20 @@ class update_user_test(user_test): "X-Auth-Token": self.auth_token, "ACCEPT": "application/xml"}) resp_val = int(resp['status']) - + content = etree.fromstring(content) if resp_val == 500: self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - delete_user(self.tenant,self.user, str(self.auth_token)) - self.assertEqual(200,resp_val) - self.assertEqual('updatedjoeuser@rackspace.com',content.get("email")) + delete_user(self.tenant, self.user, str(self.auth_token)) + self.assertEqual(200, resp_val) + self.assertEqual('updatedjoeuser@rackspace.com', content.get("email")) self.assertEqual('application/xml', content_type(resp)) def test_user_update_user_disabled_json(self): h = httplib2.Http(".cache") - url = '%stenants/%s/users/%s' % (URL,self.tenant, self.userdisabled) + url = '%stenants/%s/users/%s' % (URL, self.tenant, self.userdisabled) data = '{"user": { "email": "updatedjoeuser@rackspace.com"}}' resp, content = h.request(url, "PUT", body=data, headers={"Content-Type": "application/json", @@ -917,11 +916,11 @@ class update_user_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) def test_user_update_user_disabled_xml(self): h = httplib2.Http(".cache") - url = '%stenants/%s/users/%s' % (URL,self.tenant, self.userdisabled) + url = '%stenants/%s/users/%s' % (URL, self.tenant, self.userdisabled) data = ' \ ' @@ -935,17 +934,17 @@ class update_user_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_user_update_email_conflict_json(self): h = httplib2.Http(".cache") - resp, content = create_user_xml(self.tenant,self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) data = '{"user": { "email": "joe@rackspace.com"}}' resp, content = h.request(url, "PUT", body=data, - headers={"Content-Type": "application/json", + headers={"Content-Type": "application/json", "X-Auth-Token": self.auth_token}) resp_val = int(resp['status']) content = json.loads(content) @@ -957,7 +956,7 @@ class update_user_test(user_test): def test_user_update_email_conflict_xml(self): h = httplib2.Http(".cache") - resp, content = create_user_xml(self.tenant,self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) data = ' \ @@ -978,7 +977,7 @@ class update_user_test(user_test): def test_user_update_bad_request_json(self): h = httplib2.Http(".cache") - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) data = '{"user_bad": { "bad": "updatedjoeuser@rackspace.com"}}' @@ -991,14 +990,14 @@ class update_user_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - delete_user(self.tenant,self.user, str(self.auth_token)) + delete_user(self.tenant, self.user, str(self.auth_token)) self.assertEqual(400, resp_val) def test_user_update_bad_request_xml(self): h = httplib2.Http(".cache") - resp, content = create_user_xml(self.tenant,self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.auth_token)) - url = '%stenants/%s/users/%s' % (URL,self.tenant,self.user) + url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) data = ' \ user xmlns="http://docs.openstack.org/idm/api/v1.0" \ email="updatedjoeuser@rackspace.com" />' @@ -1012,19 +1011,17 @@ class update_user_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - delete_user(self.tenant,self.user, str(self.auth_token)) - self.assertEqual(400,resp_val) + delete_user(self.tenant, self.user, str(self.auth_token)) + self.assertEqual(400, resp_val) self.assertEqual('application/xml', content_type(resp)) - def test_user_update_expired_token_json(self): h = httplib2.Http(".cache") url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) data = '{"user": { "email": "updatedjoeuser@rackspace.com"}}' - resp, content = h.request(url, "PUT", body=data, + resp, content = h.request(url, "PUT", body=data, headers={"Content-Type": "application/json", - "X-Auth-Token": self.exp_auth_token - }) + "X-Auth-Token": self.exp_auth_token}) resp_val = int(resp['status']) content = json.loads(content) if resp_val == 500: @@ -1058,8 +1055,7 @@ class update_user_test(user_test): data = '{"user": { "email": "updatedjoeuser@rackspace.com"}}' resp, content = h.request(url, "PUT", body=data, headers={"Content-Type": "application/json", - "X-Auth-Token": self.disabled_token - }) + "X-Auth-Token": self.disabled_token}) resp_val = int(resp['status']) content = json.loads(content) if resp_val == 500: @@ -1090,13 +1086,13 @@ class update_user_test(user_test): def test_user_update_invalid_token_json(self): h = httplib2.Http(".cache") url = '%stenants/%s/users/%s' % (URL, self.tenant, self.user) - + data = '{"user": { "email": "updatedjoeuser@rackspace.com"}}' resp, content = h.request(url, "PUT", body=data, headers={"Content-Type": "application/json", "X-Auth-Token": self.invalid_token}) resp_val = int(resp['status']) - + content = json.loads(content) if resp_val == 500: self.fail('IDM fault') @@ -1162,9 +1158,9 @@ class set_password_test(user_test): def test_user_password_json(self): h = httplib2.Http(".cache") - resp, content = create_user(self.tenant,self.user, + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) - url = '%stenants/%s/users/%s/password' % (URL,self.tenant,self.user) + url = '%stenants/%s/users/%s/password' % (URL, self.tenant, self.user) data = '{"user": { "password": "p@ssword"}}' resp, content = h.request(url, "PUT", body=data, headers={"Content-Type": "application/json", @@ -1175,13 +1171,13 @@ class set_password_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - delete_user(self.tenant,self.user, str(self.auth_token)) - self.assertEqual(200,resp_val) - self.assertEqual('p@ssword',content['user']['password']) + delete_user(self.tenant, self.user, str(self.auth_token)) + self.assertEqual(200, resp_val) + self.assertEqual('p@ssword', content['user']['password']) def test_user_password_xml(self): h = httplib2.Http(".cache") - resp, content = create_user_xml(self.tenant,self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.auth_token)) url = '%stenants/%s/users/%s/password' % (URL, self.tenant, self.user) data = ' \ @@ -1198,23 +1194,25 @@ class set_password_test(user_test): elif resp_val == 503: self.fail('Service Not Available') delete_user(self.tenant, self.user, str(self.auth_token)) - self.assertEqual(200,resp_val) + self.assertEqual(200, resp_val) self.assertEqual('p@ssword', content.get("password")) self.assertEqual('application/xml', content_type(resp)) def test_user_password_user_disabled_json(self): h = httplib2.Http(".cache") - url = '%stenants/%s/users/%s/password' % (URL, self.tenant, self.userdisabled) + url = '%stenants/%s/users/%s/password' \ + % (URL, self.tenant, self.userdisabled) data = '{"user": { "password": "p@ssword"}}' resp, content = h.request(url, "PUT", body=data, - headers={"Content-Type": "application/json", "X-Auth-Token": self.auth_token}) + headers={"Content-Type": "application/json", + "X-Auth-Token": self.auth_token}) resp_val = int(resp['status']) content = json.loads(content) if resp_val == 500: self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) def test_user_password_user_disabled_xml(self): h = httplib2.Http(".cache") @@ -1232,12 +1230,12 @@ class set_password_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(403,resp_val) + self.assertEqual(403, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_user_password_bad_request_json(self): h = httplib2.Http(".cache") - resp, content = create_user(self.tenant, self.user, + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) url = '%stenants/%s/users/%s/password' % (URL, self.tenant, self.user) data = '{"user_bad": { "password": "p@ssword"}}' @@ -1250,14 +1248,14 @@ class set_password_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - delete_user(self.tenant,self.user, str(self.auth_token)) - self.assertEqual(400,resp_val) + delete_user(self.tenant, self.user, str(self.auth_token)) + self.assertEqual(400, resp_val) def test_user_password_bad_request_xml(self): h = httplib2.Http(".cache") - resp, content = create_user_xml(self.tenant,self.user, + resp, content = create_user_xml(self.tenant, self.user, str(self.auth_token)) - url = '%stenants/%s/users/%s/password' % (URL,self.tenant,self.user) + url = '%stenants/%s/users/%s/password' % (URL, self.tenant, self.user) data = ' \ user xmlns="http://docs.openstack.org/idm/api/v1.0" \ password="p@ssword" />' @@ -1271,18 +1269,17 @@ class set_password_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - delete_user(self.tenant,self.user, str(self.auth_token)) - self.assertEqual(400,resp_val) + delete_user(self.tenant, self.user, str(self.auth_token)) + self.assertEqual(400, resp_val) self.assertEqual('application/xml', content_type(resp)) - def test_user_password_expired_token_json(self): h = httplib2.Http(".cache") url = '%stenants/%s/users/%s/password' % (URL, self.tenant, self.user) data = '{"user": { "password": "p@ssword"}}' resp, content = h.request(url, "PUT", body=data, - headers={"Content-Type": "application/json", - "X-Auth-Token": self.exp_auth_token}) + headers={"Content-Type": "application/json", + "X-Auth-Token": self.exp_auth_token}) resp_val = int(resp['status']) content = json.loads(content) if resp_val == 500: @@ -1316,7 +1313,7 @@ class set_password_test(user_test): data = '{"user": { "password": "p@ssword"}}' resp, content = h.request(url, "PUT", body=data, headers={"Content-Type": "application/json", - "X-Auth-Token": self.disabled_token}) + "X-Auth-Token": self.disabled_token}) resp_val = int(resp['status']) content = json.loads(content) if resp_val == 500: @@ -1357,7 +1354,7 @@ class set_password_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(404,resp_val) + self.assertEqual(404, resp_val) def test_user_password_invalid_token_xml(self): h = httplib2.Http(".cache") @@ -1375,7 +1372,7 @@ class set_password_test(user_test): self.fail('IDM fault') elif resp_val == 503: self.fail('Service Not Available') - self.assertEqual(404,resp_val) + self.assertEqual(404, resp_val) self.assertEqual('application/xml', content_type(resp)) def test_user_password_missing_token_json(self): @@ -1417,15 +1414,15 @@ class set_enabled_test(user_test): def test_user_enabled_json(self): h = httplib2.Http(".cache") - resp, content = create_user(self.tenant,self.user, + resp, content = create_user(self.tenant, self.user, str(self.auth_token)) url = '%stenants/%s/users/%s/enabled' % (URL, self.tenant, self.user) - data = {"user": { "enabled": True}} + data = {"user": {"enabled": True}} resp, content = h.request(url, "PUT", body=json.dumps(data), headers={"Content-Type": "application/json", "X-Auth-Token": self.auth_token}) resp_val = int(resp['status']) - + content = json.loads(content) if resp_val == 500: self.fail('IDM fault') @@ -1437,7 +1434,8 @@ class set_enabled_test(user_test): def test_user_enabled_xml(self): h = httplib2.Http(".cache") - resp, content = create_user_xml(self.tenant,self.user, str(self.auth_token)) + resp, content = create_user_xml(self.tenant, self.user, + str(self.auth_token)) url = '%stenants/%s/users/%s/enabled' % (URL, self.tenant, self.user) data = ' \