From dc9e8e054657cf026de789ef6a8777bf8ae34112 Mon Sep 17 00:00:00 2001 From: Ian Murray Date: Fri, 18 Nov 2011 13:16:21 +0000 Subject: [PATCH] [functional/test_admin] Prevented test_admin classes from overwriting config with contents of test.ini. Create the WSGI app the normal way. --- ckan/tests/functional/test_admin.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/ckan/tests/functional/test_admin.py b/ckan/tests/functional/test_admin.py index de2733da240..94405dedad7 100644 --- a/ckan/tests/functional/test_admin.py +++ b/ckan/tests/functional/test_admin.py @@ -3,15 +3,12 @@ import paste.fixture from ckan.config.middleware import make_app import ckan.model as model -from ckan.tests import conf_dir, url_for, CreateTestData +from ckan.tests import conf_dir, url_for, CreateTestData, WsgiAppCase from controllers.admin import get_sysadmins -class TestAdminController: +class TestAdminController(WsgiAppCase): @classmethod def setup_class(cls): - config = appconfig('config:test.ini', relative_to=conf_dir) - wsgiapp = make_app(config.global_conf, **config.local_conf) - cls.app = paste.fixture.TestApp(wsgiapp) # setup test data including testsysadmin user CreateTestData.create() @@ -34,12 +31,9 @@ def test_index(self): assert 'Administration' in response, response -class TestAdminAuthzController: +class TestAdminAuthzController(WsgiAppCase): @classmethod def setup_class(cls): - config = appconfig('config:test.ini', relative_to=conf_dir) - wsgiapp = make_app(config.global_conf, **config.local_conf) - cls.app = paste.fixture.TestApp(wsgiapp) # setup test data including testsysadmin user CreateTestData.create() # Creating a couple of authorization groups, which are enough to break @@ -235,11 +229,8 @@ def get_roles_by_name(user=None, group=None): "should be a reader now" -class TestAdminTrashController: +class TestAdminTrashController(WsgiAppCase): def setup(cls): - config = appconfig('config:test.ini', relative_to=conf_dir) - wsgiapp = make_app(config.global_conf, **config.local_conf) - cls.app = paste.fixture.TestApp(wsgiapp) CreateTestData.create() def teardown(self):