allow creating none default package types for testing purposes

ckan/lib/create_test_data.py

@@ -308,7 +308,7 @@ def create_groups(cls, group_dicts, admin_user_name=None, auth_profile=""):
         model.repo.commit_and_remove()
 
     @classmethod
-    def create(cls, auth_profile=""):
+    def create(cls, auth_profile="", package_type=None):
         import ckan.model as model
         model.Session.remove()
         rev = model.repo.new_revision()
@@ -323,7 +323,7 @@ def create(cls, auth_profile=""):
             publisher_group = model.Group(name=u"publisher_group", type="publisher")
 
         cls.pkg_names = [u'annakarenina', u'warandpeace']
-        pkg1 = model.Package(name=cls.pkg_names[0])
+        pkg1 = model.Package(name=cls.pkg_names[0], type=package_type)
         if auth_profile == "publisher":        
             pkg1.group = publisher_group
         model.Session.add(pkg1)
@@ -375,7 +375,7 @@ def create(cls, auth_profile=""):
 <http://ckan.net/>
 
 '''
-        pkg2 = model.Package(name=cls.pkg_names[1])
+        pkg2 = model.Package(name=cls.pkg_names[1], type=package_type)
         tag1 = model.Tag(name=u'russian')
         tag2 = model.Tag(name=u'tolstoy')
 

ckan/tests/functional/test_tag_vocab.py

@@ -137,7 +137,7 @@ def value__get(self):
 class TestWUI(WsgiAppCase):
     @classmethod
     def setup_class(cls):
-        CreateTestData.create()
+        CreateTestData.create(package_type='mock_vocab_tags_plugin')
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.dset = model.Package.get('warandpeace')
         cls.tag1_name = 'vocab-tag-1'
@@ -147,12 +147,6 @@ def setup_class(cls):
         plugins.load(cls.plugin)
         cls.plugin.active = True
 
-        # this is a hack so that the plugin is properly registered with
-        # the package controller class.
-        from ckan.controllers import package as package_controller
-        cls.old_default_controller = package_controller._default_controller_behaviour
-        package_controller._default_controller_behaviour = cls.plugin
-
         # use our custom select class for this test suite
         cls.old_select = paste.fixture.Field.classes['select']
         paste.fixture.Field.classes['select'] = Select
@@ -180,8 +174,6 @@ def setup_class(cls):
     def teardown_class(cls):
         plugins.unload(cls.plugin)
         cls.plugin.active = False
-        from ckan.controllers import package as package_controller
-        package_controller._default_controller_behaviour = cls.old_default_controller
         paste.fixture.Field.classes['select'] = cls.old_select
         model.repo.rebuild_db()