From 07f2d0d2bb455eed82d16cb13b189fef659663a9 Mon Sep 17 00:00:00 2001 From: amercader Date: Fri, 7 Nov 2014 16:19:00 +0000 Subject: [PATCH] [#2035] Remove uneeded calls to clear_auth_functions_cache() --- ckan/new_tests/helpers.py | 2 -- ckan/tests/functional/api/test_user.py | 8 -------- 2 files changed, 10 deletions(-) diff --git a/ckan/new_tests/helpers.py b/ckan/new_tests/helpers.py index 2623ad9df7d..7cb632aa120 100644 --- a/ckan/new_tests/helpers.py +++ b/ckan/new_tests/helpers.py @@ -295,13 +295,11 @@ def decorator(func): def wrapper(*args, **kwargs): _original_config = config.copy() config[key] = value - new_authz.clear_auth_functions_cache() return_value = func(*args, **kwargs) config.clear() config.update(_original_config) - new_authz.clear_auth_functions_cache() return return_value return nose.tools.make_decorator(func)(wrapper) diff --git a/ckan/tests/functional/api/test_user.py b/ckan/tests/functional/api/test_user.py index 875e8a668ab..0b0fabd7e34 100644 --- a/ckan/tests/functional/api/test_user.py +++ b/ckan/tests/functional/api/test_user.py @@ -68,7 +68,6 @@ class TestCreateUserApiDisabled(PylonsTestCase): def setup_class(cls): CreateTestData.create() cls._original_config = config.copy() - new_authz.clear_auth_functions_cache() wsgiapp = ckan.config.middleware.make_app( config['global_conf'], **config) cls.app = paste.fixture.TestApp(wsgiapp) @@ -79,7 +78,6 @@ def setup_class(cls): def teardown_class(cls): config.clear() config.update(cls._original_config) - new_authz.clear_auth_functions_cache() PylonsTestCase.teardown_class() model.repo.rebuild_db() @@ -120,7 +118,6 @@ def setup_class(cls): CreateTestData.create() cls._original_config = config.copy() config['ckan.auth.create_user_via_api'] = True - new_authz.clear_auth_functions_cache() wsgiapp = ckan.config.middleware.make_app( config['global_conf'], **config) cls.app = paste.fixture.TestApp(wsgiapp) @@ -131,7 +128,6 @@ def setup_class(cls): def teardown_class(cls): config.clear() config.update(cls._original_config) - new_authz.clear_auth_functions_cache() PylonsTestCase.teardown_class() model.repo.rebuild_db() @@ -170,7 +166,6 @@ def setup_class(cls): CreateTestData.create() cls._original_config = config.copy() config['ckan.auth.create_user_via_web'] = False - new_authz.clear_auth_functions_cache() wsgiapp = ckan.config.middleware.make_app( config['global_conf'], **config) cls.app = paste.fixture.TestApp(wsgiapp) @@ -181,7 +176,6 @@ def setup_class(cls): def teardown_class(cls): config.clear() config.update(cls._original_config) - new_authz.clear_auth_functions_cache() PylonsTestCase.teardown_class() model.repo.rebuild_db() @@ -208,7 +202,6 @@ def setup_class(cls): CreateTestData.create() cls._original_config = config.copy() config['ckan.auth.create_user_via_web'] = True - new_authz.clear_auth_functions_cache() wsgiapp = ckan.config.middleware.make_app( config['global_conf'], **config) cls.app = paste.fixture.TestApp(wsgiapp) @@ -219,7 +212,6 @@ def setup_class(cls): def teardown_class(cls): config.clear() config.update(cls._original_config) - new_authz.clear_auth_functions_cache() PylonsTestCase.teardown_class() model.repo.rebuild_db()