Skip to content

Commit

Permalink
[#2035] Remove uneeded calls to clear_auth_functions_cache()
Browse files Browse the repository at this point in the history
  • Loading branch information
amercader committed Nov 7, 2014
1 parent 2b6c1ed commit 07f2d0d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
2 changes: 0 additions & 2 deletions ckan/new_tests/helpers.py
Expand Up @@ -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)
Expand Down
8 changes: 0 additions & 8 deletions ckan/tests/functional/api/test_user.py
Expand Up @@ -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)
Expand All @@ -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()
Expand Down Expand Up @@ -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)
Expand All @@ -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()
Expand Down Expand Up @@ -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)
Expand All @@ -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()
Expand All @@ -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)
Expand All @@ -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()
Expand Down

0 comments on commit 07f2d0d

Please sign in to comment.