Skip to content

Commit

Permalink
[functional/test_admin] Prevented test_admin classes from overwriting…
Browse files Browse the repository at this point in the history
… config with contents of test.ini.

Create the WSGI app the normal way.
  • Loading branch information
icmurray committed Nov 21, 2011
1 parent 47216c4 commit dc9e8e0
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions ckan/tests/functional/test_admin.py
Expand Up @@ -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()

Expand All @@ -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
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit dc9e8e0

Please sign in to comment.