[#547] Fix tests affected by merge

ckan · Jun 3, 2013 · 6fc6bfd · 6fc6bfd
1 parent e5b4080
commit 6fc6bfd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py
@@ -148,7 +148,6 @@ class TestImportFromCkan(object):
         'bin/ckan-hmg-breakdown.py',
         'bin/dump-ukgov.py',
         'ckan/config/middleware.py',
-        'ckan/config/routing.py',
         'ckan/controllers/error.py',
         'ckan/controllers/storage.py',
         'ckan/lib/authenticator.py',
@@ -171,7 +170,6 @@ class TestImportFromCkan(object):
         'ckan/migration/versions/035_harvesting_doc_versioning.py',
         'ckan/model/test_user.py',
         'ckan/plugins/__init__.py',
-        'ckan/plugins/core.py',
         'ckan/tests/__init__.py',
         'ckan/tests/ckantestplugin/ckantestplugin/__init__.py',
         'ckan/tests/functional/api/base.py',
@@ -482,7 +480,6 @@ class TestPep8(object):
         'bin/webstore_test.py',
         'ckan/__init__.py',
         'ckan/ckan_nose_plugin.py',
-        'ckan/config/environment.py',
         'ckan/config/middleware.py',
         'ckan/config/routing.py',
         'ckan/config/sp_config.py',
@@ -500,7 +497,6 @@ class TestPep8(object):
         'ckan/lib/alphabet_paginate.py',
         'ckan/lib/app_globals.py',
         'ckan/lib/authenticator.py',
-        'ckan/lib/base.py',
         'ckan/lib/captcha.py',
         'ckan/lib/cli.py',
         'ckan/lib/create_test_data.py',
@@ -645,7 +641,6 @@ class TestPep8(object):
         'ckan/model/vocabulary.py',
         'ckan/new_authz.py',
         'ckan/pastertemplates/__init__.py',
-        'ckan/plugins/core.py',
         'ckan/plugins/interfaces.py',
         'ckan/plugins/toolkit.py',
         'ckan/poo.py',

diff --git a/ckanext/textpreview/tests/test_preview.py b/ckanext/textpreview/tests/test_preview.py
@@ -42,7 +42,7 @@ def setup_class(cls):
 
     @classmethod
     def teardown_class(cls):
-        plugins.unload('json_preview')
+        plugins.unload('text_preview')
         create_test_data.CreateTestData.delete()
 
     def test_can_preview(self):