From 533284b2178c83d2d0859efc5f55598047e02f62 Mon Sep 17 00:00:00 2001 From: David Read Date: Fri, 16 Jan 2015 10:07:00 +0000 Subject: [PATCH] [#1753] Move legacy tests to ckan/tests/legacy. --- ckan/tests/__init__.py | 13 +- ckan/tests/functional/__init__.py | 5 +- ckan/tests/functional/api/base.py | 6 +- ckan/tests/functional/base.py | 4 +- .../legacy}/__init__.py | 0 .../legacy}/ckantestplugins.py | 2 +- .../legacy}/functional/__init__.py | 0 .../legacy}/functional/api/__init__.py | 0 .../legacy}/functional/api/base.py | 4 +- .../legacy}/functional/api/model/__init__.py | 0 .../functional/api/model/test_group.py | 6 +- .../test_group_and_organization_purge.py | 2 +- .../functional/api/model/test_licenses.py | 6 +- .../functional/api/model/test_package.py | 8 +- .../functional/api/model/test_ratings.py | 6 +- .../api/model/test_relationships.py | 6 +- .../functional/api/model/test_revisions.py | 6 +- .../legacy}/functional/api/model/test_tag.py | 6 +- .../functional/api/model/test_vocabulary.py | 6 +- .../legacy}/functional/api/test_activity.py | 2 +- .../legacy}/functional/api/test_api.py | 6 +- .../legacy}/functional/api/test_dashboard.py | 2 +- .../api/test_email_notifications.py | 6 +- .../legacy}/functional/api/test_follow.py | 2 +- .../legacy}/functional/api/test_misc.py | 4 +- .../functional/api/test_package_search.py | 6 +- .../legacy}/functional/api/test_resource.py | 4 +- .../functional/api/test_resource_search.py | 4 +- .../functional/api/test_revision_search.py | 4 +- .../legacy}/functional/api/test_user.py | 6 +- .../legacy}/functional/api/test_util.py | 4 +- ckan/tests/legacy/functional/base.py | 5 + .../legacy}/functional/test_activity.py | 4 +- .../legacy}/functional/test_admin.py | 2 +- .../legacy}/functional/test_error.py | 0 .../legacy}/functional/test_group.py | 6 +- .../legacy}/functional/test_home.py | 8 +- .../legacy}/functional/test_package.py | 8 +- .../legacy}/functional/test_pagination.py | 2 +- .../functional/test_preview_interface.py | 2 +- .../legacy}/functional/test_related.py | 6 +- .../legacy}/functional/test_revision.py | 2 +- .../legacy}/functional/test_storage.py | 2 +- .../legacy}/functional/test_tag.py | 2 +- .../legacy}/functional/test_tracking.py | 2 +- .../legacy}/functional/test_user.py | 8 +- .../legacy}/html_check.py | 0 .../legacy}/lib/__init__.py | 0 .../legacy}/lib/solr/schema-no-version.xml | 0 .../legacy}/lib/solr/schema-wrong-version.xml | 0 .../legacy}/lib/test_accept.py | 0 .../legacy}/lib/test_alphabet_pagination.py | 4 +- .../legacy}/lib/test_authenticator.py | 0 .../legacy}/lib/test_cli.py | 0 .../legacy}/lib/test_datapreview.py | 0 .../legacy}/lib/test_dictization.py | 2 +- .../legacy}/lib/test_dictization_schema.py | 0 .../legacy}/lib/test_email_notifications.py | 0 .../legacy}/lib/test_hash.py | 0 .../legacy}/lib/test_helpers.py | 2 +- .../legacy}/lib/test_i18n.py | 2 +- .../legacy}/lib/test_mailer.py | 4 +- .../legacy}/lib/test_munge.py | 0 .../legacy}/lib/test_navl.py | 0 .../legacy}/lib/test_resource_search.py | 4 +- .../legacy}/lib/test_simple_search.py | 0 .../legacy}/lib/test_solr_package_search.py | 6 +- ..._solr_package_search_synchronous_update.py | 4 +- .../legacy}/lib/test_solr_schema_version.py | 4 +- .../legacy}/lib/test_solr_search_index.py | 2 +- .../legacy}/lib/test_tag_search.py | 4 +- .../legacy}/logic/__init__.py | 0 .../legacy}/logic/test_action.py | 12 +- .../legacy}/logic/test_auth.py | 2 +- .../legacy}/logic/test_init.py | 0 .../legacy}/logic/test_member.py | 0 .../legacy}/logic/test_tag.py | 4 +- .../legacy}/logic/test_tag_vocab.py | 2 +- .../legacy}/logic/test_validators.py | 0 .../legacy}/misc/__init__.py | 0 .../legacy}/misc/test_format_text.py | 0 .../legacy}/misc/test_mock_mail_server.py | 4 +- .../legacy}/misc/test_sync.py | 2 +- .../legacy}/mock_mail_server.py | 0 .../legacy}/mock_plugin.py | 0 .../legacy}/models/__init__.py | 0 .../legacy}/models/test_activity.py | 0 .../legacy}/models/test_extras.py | 2 +- .../legacy}/models/test_follower.py | 0 .../legacy}/models/test_group.py | 2 +- .../legacy}/models/test_license.py | 0 .../legacy}/models/test_misc.py | 2 +- .../legacy}/models/test_package.py | 2 +- .../models/test_package_relationships.py | 2 +- .../legacy}/models/test_purge_revision.py | 2 +- .../legacy}/models/test_resource.py | 2 +- .../legacy}/models/test_revision.py | 2 +- .../legacy}/models/test_user.py | 2 +- .../legacy}/pylons_controller.py | 2 +- .../legacy}/schema/__init__.py | 0 .../legacy}/schema/test_schema.py | 0 .../legacy}/test_coding_standards.py | 236 +++++++++--------- .../legacy}/test_dumper.py | 2 +- .../legacy}/test_plugins.py | 0 .../legacy}/test_versions.py | 0 .../legacy}/test_wsgi_ckanclient.py | 2 +- .../legacy}/wsgi_ckanclient.py | 0 ckan/tests_legacy/functional/base.py | 5 - ckanext/datapusher/tests/test.py | 2 +- ckanext/datastore/tests/test_create.py | 2 +- ckanext/datastore/tests/test_delete.py | 2 +- ckanext/datastore/tests/test_dump.py | 2 +- ckanext/datastore/tests/test_search.py | 2 +- ckanext/datastore/tests/test_unit.py | 2 +- ckanext/datastore/tests/test_upsert.py | 2 +- .../tests/test_example_iauthfunctions.py | 2 +- .../tests/test_example_iresourcecontroller.py | 2 +- ckanext/imageview/tests/test_view.py | 2 +- .../tests/test_multilingual_plugin.py | 12 +- ckanext/pdfview/tests/test_view.py | 2 +- ckanext/reclineview/tests/test_view.py | 2 +- ckanext/resourceproxy/tests/test_proxy.py | 2 +- ckanext/stats/tests/test_stats_plugin.py | 2 +- ckanext/textview/tests/test_view.py | 2 +- ckanext/webpageview/tests/test_view.py | 2 +- setup.py | 24 +- 126 files changed, 293 insertions(+), 299 deletions(-) rename ckan/{tests_legacy => tests/legacy}/__init__.py (100%) rename ckan/{tests_legacy => tests/legacy}/ckantestplugins.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/__init__.py (100%) rename ckan/{tests_legacy => tests/legacy}/functional/api/__init__.py (100%) rename ckan/{tests_legacy => tests/legacy}/functional/api/base.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/api/model/__init__.py (100%) rename ckan/{tests_legacy => tests/legacy}/functional/api/model/test_group.py (98%) rename ckan/{tests_legacy => tests/legacy}/functional/api/model/test_group_and_organization_purge.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/api/model/test_licenses.py (85%) rename ckan/{tests_legacy => tests/legacy}/functional/api/model/test_package.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/api/model/test_ratings.py (95%) rename ckan/{tests_legacy => tests/legacy}/functional/api/model/test_relationships.py (98%) rename ckan/{tests_legacy => tests/legacy}/functional/api/model/test_revisions.py (92%) rename ckan/{tests_legacy => tests/legacy}/functional/api/model/test_tag.py (91%) rename ckan/{tests_legacy => tests/legacy}/functional/api/model/test_vocabulary.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_activity.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_api.py (93%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_dashboard.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_email_notifications.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_follow.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_misc.py (90%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_package_search.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_resource.py (95%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_resource_search.py (96%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_revision_search.py (96%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_user.py (97%) rename ckan/{tests_legacy => tests/legacy}/functional/api/test_util.py (98%) create mode 100644 ckan/tests/legacy/functional/base.py rename ckan/{tests_legacy => tests/legacy}/functional/test_activity.py (98%) rename ckan/{tests_legacy => tests/legacy}/functional/test_admin.py (98%) rename ckan/{tests_legacy => tests/legacy}/functional/test_error.py (100%) rename ckan/{tests_legacy => tests/legacy}/functional/test_group.py (98%) rename ckan/{tests_legacy => tests/legacy}/functional/test_home.py (96%) rename ckan/{tests_legacy => tests/legacy}/functional/test_package.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/test_pagination.py (98%) rename ckan/{tests_legacy => tests/legacy}/functional/test_preview_interface.py (98%) rename ckan/{tests_legacy => tests/legacy}/functional/test_related.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/test_revision.py (98%) rename ckan/{tests_legacy => tests/legacy}/functional/test_storage.py (98%) rename ckan/{tests_legacy => tests/legacy}/functional/test_tag.py (98%) rename ckan/{tests_legacy => tests/legacy}/functional/test_tracking.py (99%) rename ckan/{tests_legacy => tests/legacy}/functional/test_user.py (96%) rename ckan/{tests_legacy => tests/legacy}/html_check.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/__init__.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/solr/schema-no-version.xml (100%) rename ckan/{tests_legacy => tests/legacy}/lib/solr/schema-wrong-version.xml (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_accept.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_alphabet_pagination.py (98%) rename ckan/{tests_legacy => tests/legacy}/lib/test_authenticator.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_cli.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_datapreview.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_dictization.py (99%) rename ckan/{tests_legacy => tests/legacy}/lib/test_dictization_schema.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_email_notifications.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_hash.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_helpers.py (99%) rename ckan/{tests_legacy => tests/legacy}/lib/test_i18n.py (97%) rename ckan/{tests_legacy => tests/legacy}/lib/test_mailer.py (97%) rename ckan/{tests_legacy => tests/legacy}/lib/test_munge.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_navl.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_resource_search.py (98%) rename ckan/{tests_legacy => tests/legacy}/lib/test_simple_search.py (100%) rename ckan/{tests_legacy => tests/legacy}/lib/test_solr_package_search.py (99%) rename ckan/{tests_legacy => tests/legacy}/lib/test_solr_package_search_synchronous_update.py (97%) rename ckan/{tests_legacy => tests/legacy}/lib/test_solr_schema_version.py (90%) rename ckan/{tests_legacy => tests/legacy}/lib/test_solr_search_index.py (97%) rename ckan/{tests_legacy => tests/legacy}/lib/test_tag_search.py (97%) rename ckan/{tests_legacy => tests/legacy}/logic/__init__.py (100%) rename ckan/{tests_legacy => tests/legacy}/logic/test_action.py (99%) rename ckan/{tests_legacy => tests/legacy}/logic/test_auth.py (99%) rename ckan/{tests_legacy => tests/legacy}/logic/test_init.py (100%) rename ckan/{tests_legacy => tests/legacy}/logic/test_member.py (100%) rename ckan/{tests_legacy => tests/legacy}/logic/test_tag.py (99%) rename ckan/{tests_legacy => tests/legacy}/logic/test_tag_vocab.py (99%) rename ckan/{tests_legacy => tests/legacy}/logic/test_validators.py (100%) rename ckan/{tests_legacy => tests/legacy}/misc/__init__.py (100%) rename ckan/{tests_legacy => tests/legacy}/misc/test_format_text.py (100%) rename ckan/{tests_legacy => tests/legacy}/misc/test_mock_mail_server.py (90%) rename ckan/{tests_legacy => tests/legacy}/misc/test_sync.py (98%) rename ckan/{tests_legacy => tests/legacy}/mock_mail_server.py (100%) rename ckan/{tests_legacy => tests/legacy}/mock_plugin.py (100%) rename ckan/{tests_legacy => tests/legacy}/models/__init__.py (100%) rename ckan/{tests_legacy => tests/legacy}/models/test_activity.py (100%) rename ckan/{tests_legacy => tests/legacy}/models/test_extras.py (98%) rename ckan/{tests_legacy => tests/legacy}/models/test_follower.py (100%) rename ckan/{tests_legacy => tests/legacy}/models/test_group.py (99%) rename ckan/{tests_legacy => tests/legacy}/models/test_license.py (100%) rename ckan/{tests_legacy => tests/legacy}/models/test_misc.py (98%) rename ckan/{tests_legacy => tests/legacy}/models/test_package.py (99%) rename ckan/{tests_legacy => tests/legacy}/models/test_package_relationships.py (99%) rename ckan/{tests_legacy => tests/legacy}/models/test_purge_revision.py (98%) rename ckan/{tests_legacy => tests/legacy}/models/test_resource.py (99%) rename ckan/{tests_legacy => tests/legacy}/models/test_revision.py (97%) rename ckan/{tests_legacy => tests/legacy}/models/test_user.py (99%) rename ckan/{tests_legacy => tests/legacy}/pylons_controller.py (98%) rename ckan/{tests_legacy => tests/legacy}/schema/__init__.py (100%) rename ckan/{tests_legacy => tests/legacy}/schema/test_schema.py (100%) rename ckan/{tests_legacy => tests/legacy}/test_coding_standards.py (83%) rename ckan/{tests_legacy => tests/legacy}/test_dumper.py (99%) rename ckan/{tests_legacy => tests/legacy}/test_plugins.py (100%) rename ckan/{tests_legacy => tests/legacy}/test_versions.py (100%) rename ckan/{tests_legacy => tests/legacy}/test_wsgi_ckanclient.py (96%) rename ckan/{tests_legacy => tests/legacy}/wsgi_ckanclient.py (100%) delete mode 100644 ckan/tests_legacy/functional/base.py diff --git a/ckan/tests/__init__.py b/ckan/tests/__init__.py index 45d63f0feee..75840ba7217 100644 --- a/ckan/tests/__init__.py +++ b/ckan/tests/__init__.py @@ -1,9 +1,6 @@ -import warnings +# Import provides (temporarily) backward compatibility for extensions that +# pre-date the move of tests from ckan.tests to ckan.test.legacy. +#from ckan.tests.legacy import * -warnings.warn( - "ckan.tests has been renamed to ckan.tests_legacy. " - "In the next release it is planned to remove ckan.tests, and possibly " - "rename ckan.new_tests to ckan.tests.", - FutureWarning) - -from ckan.tests_legacy import * +# (Not showing a deprecation warning as it would show whenever you import +# anything in ckan.tests.) diff --git a/ckan/tests/functional/__init__.py b/ckan/tests/functional/__init__.py index df5145ef0d4..14eebf0e35d 100644 --- a/ckan/tests/functional/__init__.py +++ b/ckan/tests/functional/__init__.py @@ -1,10 +1,9 @@ import warnings warnings.warn( - "ckan.tests has been renamed to ckan.tests_legacy. " + "ckan.tests has been renamed to ckan.tests.legacy. " "In the next release it is planned to remove ckan.tests, and possibly " "rename ckan.new_tests to ckan.tests.", FutureWarning) -from ckan.tests_legacy.functional import * - +#from ckan.tests.legacy.functional import * diff --git a/ckan/tests/functional/api/base.py b/ckan/tests/functional/api/base.py index 5b4b577de91..7952a6f4350 100644 --- a/ckan/tests/functional/api/base.py +++ b/ckan/tests/functional/api/base.py @@ -1,11 +1,9 @@ import warnings warnings.warn( - "ckan.tests has been renamed to ckan.tests_legacy. " + "ckan.tests has been renamed to ckan.tests.legacy. " "In the next release it is planned to remove ckan.tests, and possibly " "rename ckan.new_tests to ckan.tests.", FutureWarning) -from ckan.tests_legacy.functional.api.base import * - - +#from ckan.tests.legacy.functional.api.base import * diff --git a/ckan/tests/functional/base.py b/ckan/tests/functional/base.py index adab2af6b78..9c576ccf805 100644 --- a/ckan/tests/functional/base.py +++ b/ckan/tests/functional/base.py @@ -1,9 +1,9 @@ import warnings warnings.warn( - "ckan.tests has been renamed to ckan.tests_legacy. " + "ckan.tests has been renamed to ckan.tests.legacy. " "In the next release it is planned to remove ckan.tests, and possibly " "rename ckan.new_tests to ckan.tests.", FutureWarning) -from ckan.tests_legacy.functional.base import * +#from ckan.tests.legacy.functional.base import * diff --git a/ckan/tests_legacy/__init__.py b/ckan/tests/legacy/__init__.py similarity index 100% rename from ckan/tests_legacy/__init__.py rename to ckan/tests/legacy/__init__.py diff --git a/ckan/tests_legacy/ckantestplugins.py b/ckan/tests/legacy/ckantestplugins.py similarity index 99% rename from ckan/tests_legacy/ckantestplugins.py rename to ckan/tests/legacy/ckantestplugins.py index ee4bddd1b8c..81b51091718 100644 --- a/ckan/tests_legacy/ckantestplugins.py +++ b/ckan/tests/legacy/ckantestplugins.py @@ -1,7 +1,7 @@ from collections import defaultdict import ckan.plugins as p -import ckan.tests_legacy.mock_plugin as mock_plugin +import ckan.tests.legacy.mock_plugin as mock_plugin class MapperPlugin(p.SingletonPlugin): diff --git a/ckan/tests_legacy/functional/__init__.py b/ckan/tests/legacy/functional/__init__.py similarity index 100% rename from ckan/tests_legacy/functional/__init__.py rename to ckan/tests/legacy/functional/__init__.py diff --git a/ckan/tests_legacy/functional/api/__init__.py b/ckan/tests/legacy/functional/api/__init__.py similarity index 100% rename from ckan/tests_legacy/functional/api/__init__.py rename to ckan/tests/legacy/functional/api/__init__.py diff --git a/ckan/tests_legacy/functional/api/base.py b/ckan/tests/legacy/functional/api/base.py similarity index 99% rename from ckan/tests_legacy/functional/api/base.py rename to ckan/tests/legacy/functional/api/base.py index 4874c0a0742..4f86e9d9c26 100644 --- a/ckan/tests_legacy/functional/api/base.py +++ b/ckan/tests/legacy/functional/api/base.py @@ -12,10 +12,10 @@ from paste.fixture import TestRequest from webhelpers.html import url_escape -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model from ckan.lib.create_test_data import CreateTestData -from ckan.tests_legacy import TestController as ControllerTestCase +from ckan.tests.legacy import TestController as ControllerTestCase from ckan.common import json ACCESS_DENIED = [403] diff --git a/ckan/tests_legacy/functional/api/model/__init__.py b/ckan/tests/legacy/functional/api/model/__init__.py similarity index 100% rename from ckan/tests_legacy/functional/api/model/__init__.py rename to ckan/tests/legacy/functional/api/model/__init__.py diff --git a/ckan/tests_legacy/functional/api/model/test_group.py b/ckan/tests/legacy/functional/api/model/test_group.py similarity index 98% rename from ckan/tests_legacy/functional/api/model/test_group.py rename to ckan/tests/legacy/functional/api/model/test_group.py index d26d58046ff..f4a467ace32 100644 --- a/ckan/tests_legacy/functional/api/model/test_group.py +++ b/ckan/tests/legacy/functional/api/model/test_group.py @@ -5,9 +5,9 @@ from nose.tools import assert_equal -from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase -from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase -from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase +from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase +from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase +from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase class GroupsTestCase(BaseModelApiTestCase): diff --git a/ckan/tests_legacy/functional/api/model/test_group_and_organization_purge.py b/ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py similarity index 99% rename from ckan/tests_legacy/functional/api/model/test_group_and_organization_purge.py rename to ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py index 98ba4b66acb..b7f6b626851 100644 --- a/ckan/tests_legacy/functional/api/model/test_group_and_organization_purge.py +++ b/ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py @@ -2,7 +2,7 @@ ''' import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import paste import pylons.test diff --git a/ckan/tests_legacy/functional/api/model/test_licenses.py b/ckan/tests/legacy/functional/api/model/test_licenses.py similarity index 85% rename from ckan/tests_legacy/functional/api/model/test_licenses.py rename to ckan/tests/legacy/functional/api/model/test_licenses.py index 298af2bd604..e210fb46769 100644 --- a/ckan/tests_legacy/functional/api/model/test_licenses.py +++ b/ckan/tests/legacy/functional/api/model/test_licenses.py @@ -3,9 +3,9 @@ from ckan import model from ckan.lib.create_test_data import CreateTestData -from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase -from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase -from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase +from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase +from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase +from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase class LicensesTestCase(BaseModelApiTestCase): diff --git a/ckan/tests_legacy/functional/api/model/test_package.py b/ckan/tests/legacy/functional/api/model/test_package.py similarity index 99% rename from ckan/tests_legacy/functional/api/model/test_package.py rename to ckan/tests/legacy/functional/api/model/test_package.py index 6e832d76928..28a2805f183 100644 --- a/ckan/tests_legacy/functional/api/model/test_package.py +++ b/ckan/tests/legacy/functional/api/model/test_package.py @@ -6,11 +6,11 @@ import ckan.lib.search as search from ckan.lib.search.common import SolrSettings -from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase -from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase -from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase +from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase +from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase +from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests # Todo: Remove this ckan.model stuff. import ckan.model as model diff --git a/ckan/tests_legacy/functional/api/model/test_ratings.py b/ckan/tests/legacy/functional/api/model/test_ratings.py similarity index 95% rename from ckan/tests_legacy/functional/api/model/test_ratings.py rename to ckan/tests/legacy/functional/api/model/test_ratings.py index bb09657925c..79256dfb9ce 100644 --- a/ckan/tests_legacy/functional/api/model/test_ratings.py +++ b/ckan/tests/legacy/functional/api/model/test_ratings.py @@ -4,9 +4,9 @@ from ckan import model from ckan.lib.create_test_data import CreateTestData -from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase -from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase -from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase +from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase +from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase +from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase class RatingsTestCase(BaseModelApiTestCase): diff --git a/ckan/tests_legacy/functional/api/model/test_relationships.py b/ckan/tests/legacy/functional/api/model/test_relationships.py similarity index 98% rename from ckan/tests_legacy/functional/api/model/test_relationships.py rename to ckan/tests/legacy/functional/api/model/test_relationships.py index 3be4c570ee4..319de10e6aa 100644 --- a/ckan/tests_legacy/functional/api/model/test_relationships.py +++ b/ckan/tests/legacy/functional/api/model/test_relationships.py @@ -4,9 +4,9 @@ from ckan import model from ckan.lib.create_test_data import CreateTestData -from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase -from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase -from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase +from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase +from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase +from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase class RelationshipsTestCase(BaseModelApiTestCase): diff --git a/ckan/tests_legacy/functional/api/model/test_revisions.py b/ckan/tests/legacy/functional/api/model/test_revisions.py similarity index 92% rename from ckan/tests_legacy/functional/api/model/test_revisions.py rename to ckan/tests/legacy/functional/api/model/test_revisions.py index 0479eed2457..a9f1e5ac60c 100644 --- a/ckan/tests_legacy/functional/api/model/test_revisions.py +++ b/ckan/tests/legacy/functional/api/model/test_revisions.py @@ -3,9 +3,9 @@ from ckan import model from ckan.lib.create_test_data import CreateTestData -from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase -from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase -from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase +from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase +from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase +from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase class RevisionsTestCase(BaseModelApiTestCase): diff --git a/ckan/tests_legacy/functional/api/model/test_tag.py b/ckan/tests/legacy/functional/api/model/test_tag.py similarity index 91% rename from ckan/tests_legacy/functional/api/model/test_tag.py rename to ckan/tests/legacy/functional/api/model/test_tag.py index 02b43065de3..08e253f3734 100644 --- a/ckan/tests_legacy/functional/api/model/test_tag.py +++ b/ckan/tests/legacy/functional/api/model/test_tag.py @@ -6,9 +6,9 @@ from ckan.lib.create_test_data import CreateTestData import ckan.lib.search as search -from ckan.tests_legacy.functional.api.base import BaseModelApiTestCase -from ckan.tests_legacy.functional.api.base import Api1TestCase as Version1TestCase -from ckan.tests_legacy.functional.api.base import Api2TestCase as Version2TestCase +from ckan.tests.legacy.functional.api.base import BaseModelApiTestCase +from ckan.tests.legacy.functional.api.base import Api1TestCase as Version1TestCase +from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase class TagsTestCase(BaseModelApiTestCase): diff --git a/ckan/tests_legacy/functional/api/model/test_vocabulary.py b/ckan/tests/legacy/functional/api/model/test_vocabulary.py similarity index 99% rename from ckan/tests_legacy/functional/api/model/test_vocabulary.py rename to ckan/tests/legacy/functional/api/model/test_vocabulary.py index 60ded6c5717..0efe7004250 100644 --- a/ckan/tests_legacy/functional/api/model/test_vocabulary.py +++ b/ckan/tests/legacy/functional/api/model/test_vocabulary.py @@ -803,7 +803,7 @@ def test_add_vocab_tag_to_dataset(self): ckan.model.repo.rebuild_db() self.setup() - ckan.tests_legacy.CreateTestData.create() + ckan.tests.legacy.CreateTestData.create() # First add a tag to the vocab. vocab = self.genre_vocab tag = self._create_tag(self.sysadmin_user, 'noise', vocab) @@ -870,7 +870,7 @@ def test_delete_tag_from_vocab(self): ckan.model.repo.rebuild_db() self.setup() - ckan.tests_legacy.CreateTestData.create() + ckan.tests.legacy.CreateTestData.create() vocab = self.genre_vocab # First add some tags to the vocab. @@ -935,7 +935,7 @@ def test_delete_free_tag(self): ''' ckan.model.repo.rebuild_db() self.setup() - ckan.tests_legacy.CreateTestData.create() + ckan.tests.legacy.CreateTestData.create() # Get a package from the API. package = (self._post('/api/action/package_show', {'id': self._post('/api/action/package_list')['result'][0]}) diff --git a/ckan/tests_legacy/functional/api/test_activity.py b/ckan/tests/legacy/functional/api/test_activity.py similarity index 99% rename from ckan/tests_legacy/functional/api/test_activity.py rename to ckan/tests/legacy/functional/api/test_activity.py index 6e654e8f526..e380f08d5e0 100644 --- a/ckan/tests_legacy/functional/api/test_activity.py +++ b/ckan/tests/legacy/functional/api/test_activity.py @@ -18,7 +18,7 @@ import paste.fixture from nose import SkipTest from ckan.common import json -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests ##def package_update(context, data_dict): diff --git a/ckan/tests_legacy/functional/api/test_api.py b/ckan/tests/legacy/functional/api/test_api.py similarity index 93% rename from ckan/tests_legacy/functional/api/test_api.py rename to ckan/tests/legacy/functional/api/test_api.py index 23211165cd6..f1e12fba5ae 100644 --- a/ckan/tests_legacy/functional/api/test_api.py +++ b/ckan/tests/legacy/functional/api/test_api.py @@ -1,9 +1,9 @@ import json -from ckan.tests_legacy.functional.api.base import * +from ckan.tests.legacy.functional.api.base import * -import ckan.tests_legacy -assert_in = ckan.tests_legacy.assert_in +import ckan.tests.legacy +assert_in = ckan.tests.legacy.assert_in class ApiTestCase(ApiTestCase, ControllerTestCase): diff --git a/ckan/tests_legacy/functional/api/test_dashboard.py b/ckan/tests/legacy/functional/api/test_dashboard.py similarity index 99% rename from ckan/tests_legacy/functional/api/test_dashboard.py rename to ckan/tests/legacy/functional/api/test_dashboard.py index 2ace6f5eab9..14d373c24c3 100644 --- a/ckan/tests_legacy/functional/api/test_dashboard.py +++ b/ckan/tests/legacy/functional/api/test_dashboard.py @@ -9,7 +9,7 @@ from ckan.common import json import paste import pylons.test -from ckan.tests_legacy import CreateTestData +from ckan.tests.legacy import CreateTestData class TestDashboard(object): '''Tests for the logic action functions related to the user's dashboard.''' diff --git a/ckan/tests_legacy/functional/api/test_email_notifications.py b/ckan/tests/legacy/functional/api/test_email_notifications.py similarity index 99% rename from ckan/tests_legacy/functional/api/test_email_notifications.py rename to ckan/tests/legacy/functional/api/test_email_notifications.py index 29f7305fac7..84a4960ad3c 100644 --- a/ckan/tests_legacy/functional/api/test_email_notifications.py +++ b/ckan/tests/legacy/functional/api/test_email_notifications.py @@ -3,9 +3,9 @@ import ckan.model as model import ckan.lib.base import ckan.lib.mailer -import ckan.tests_legacy as tests -import ckan.tests_legacy.mock_mail_server as mock_mail_server -import ckan.tests_legacy.pylons_controller as pylons_controller +import ckan.tests.legacy as tests +import ckan.tests.legacy.mock_mail_server as mock_mail_server +import ckan.tests.legacy.pylons_controller as pylons_controller import ckan.config.middleware import paste diff --git a/ckan/tests_legacy/functional/api/test_follow.py b/ckan/tests/legacy/functional/api/test_follow.py similarity index 99% rename from ckan/tests_legacy/functional/api/test_follow.py rename to ckan/tests/legacy/functional/api/test_follow.py index 7528bdefcad..3b2d00405e6 100644 --- a/ckan/tests_legacy/functional/api/test_follow.py +++ b/ckan/tests/legacy/functional/api/test_follow.py @@ -14,7 +14,7 @@ import paste import pylons.test import ckan -from ckan.tests_legacy import are_foreign_keys_supported, SkipTest, CreateTestData, call_action_api +from ckan.tests.legacy import are_foreign_keys_supported, SkipTest, CreateTestData, call_action_api def datetime_from_string(s): diff --git a/ckan/tests_legacy/functional/api/test_misc.py b/ckan/tests/legacy/functional/api/test_misc.py similarity index 90% rename from ckan/tests_legacy/functional/api/test_misc.py rename to ckan/tests/legacy/functional/api/test_misc.py index c8afd065b89..673a0a41ca3 100644 --- a/ckan/tests_legacy/functional/api/test_misc.py +++ b/ckan/tests/legacy/functional/api/test_misc.py @@ -1,7 +1,7 @@ from paste.deploy.converters import asbool -from ckan.tests_legacy.functional.api.base import * +from ckan.tests.legacy.functional.api.base import * from ckan.lib.create_test_data import CreateTestData -from ckan.tests_legacy import TestController as ControllerTestCase +from ckan.tests.legacy import TestController as ControllerTestCase class MiscApiTestCase(ApiTestCase, ControllerTestCase): diff --git a/ckan/tests_legacy/functional/api/test_package_search.py b/ckan/tests/legacy/functional/api/test_package_search.py similarity index 99% rename from ckan/tests_legacy/functional/api/test_package_search.py rename to ckan/tests/legacy/functional/api/test_package_search.py index ab6dbc6d5c6..512c5e6f5ce 100644 --- a/ckan/tests_legacy/functional/api/test_package_search.py +++ b/ckan/tests/legacy/functional/api/test_package_search.py @@ -5,9 +5,9 @@ from ckan import plugins import ckan.lib.search as search -from ckan.tests_legacy import setup_test_search_index -from ckan.tests_legacy.functional.api.base import * -from ckan.tests_legacy import TestController as ControllerTestCase +from ckan.tests.legacy import setup_test_search_index +from ckan.tests.legacy.functional.api.base import * +from ckan.tests.legacy import TestController as ControllerTestCase from ckan.controllers.api import ApiController from webob.multidict import UnicodeMultiDict diff --git a/ckan/tests_legacy/functional/api/test_resource.py b/ckan/tests/legacy/functional/api/test_resource.py similarity index 95% rename from ckan/tests_legacy/functional/api/test_resource.py rename to ckan/tests/legacy/functional/api/test_resource.py index a2cb8fc16f0..e6ef1932263 100644 --- a/ckan/tests_legacy/functional/api/test_resource.py +++ b/ckan/tests/legacy/functional/api/test_resource.py @@ -1,5 +1,5 @@ -from ckan.tests_legacy.functional.api.base import ApiTestCase, CreateTestData -from ckan.tests_legacy import TestController as ControllerTestCase +from ckan.tests.legacy.functional.api.base import ApiTestCase, CreateTestData +from ckan.tests.legacy import TestController as ControllerTestCase from ckan import model class TestResourceApi(ApiTestCase, ControllerTestCase): diff --git a/ckan/tests_legacy/functional/api/test_resource_search.py b/ckan/tests/legacy/functional/api/test_resource_search.py similarity index 96% rename from ckan/tests_legacy/functional/api/test_resource_search.py rename to ckan/tests/legacy/functional/api/test_resource_search.py index d920228b47f..24ce4411127 100644 --- a/ckan/tests_legacy/functional/api/test_resource_search.py +++ b/ckan/tests/legacy/functional/api/test_resource_search.py @@ -1,5 +1,5 @@ -from ckan.tests_legacy.functional.api.base import * -from ckan.tests_legacy import TestController as ControllerTestCase +from ckan.tests.legacy.functional.api.base import * +from ckan.tests.legacy import TestController as ControllerTestCase class ResourceSearchApiTestCase(ApiTestCase, ControllerTestCase): diff --git a/ckan/tests_legacy/functional/api/test_revision_search.py b/ckan/tests/legacy/functional/api/test_revision_search.py similarity index 96% rename from ckan/tests_legacy/functional/api/test_revision_search.py rename to ckan/tests/legacy/functional/api/test_revision_search.py index 80c2183d8f1..8d19259d90c 100644 --- a/ckan/tests_legacy/functional/api/test_revision_search.py +++ b/ckan/tests/legacy/functional/api/test_revision_search.py @@ -1,5 +1,5 @@ -from ckan.tests_legacy.functional.api.base import * -from ckan.tests_legacy import TestController as ControllerTestCase +from ckan.tests.legacy.functional.api.base import * +from ckan.tests.legacy import TestController as ControllerTestCase class RevisionSearchApiTestCase(ApiTestCase, ControllerTestCase): diff --git a/ckan/tests_legacy/functional/api/test_user.py b/ckan/tests/legacy/functional/api/test_user.py similarity index 97% rename from ckan/tests_legacy/functional/api/test_user.py rename to ckan/tests/legacy/functional/api/test_user.py index 9a1a3f10fee..dc14caa51b6 100644 --- a/ckan/tests_legacy/functional/api/test_user.py +++ b/ckan/tests/legacy/functional/api/test_user.py @@ -6,9 +6,9 @@ import ckan.new_authz as new_authz from ckan import model from ckan.lib.create_test_data import CreateTestData -from ckan.tests_legacy import TestController as ControllerTestCase -from ckan.tests_legacy.pylons_controller import PylonsTestCase -from ckan.tests_legacy import url_for +from ckan.tests.legacy import TestController as ControllerTestCase +from ckan.tests.legacy.pylons_controller import PylonsTestCase +from ckan.tests.legacy import url_for import ckan.config.middleware from ckan.common import json diff --git a/ckan/tests_legacy/functional/api/test_util.py b/ckan/tests/legacy/functional/api/test_util.py similarity index 98% rename from ckan/tests_legacy/functional/api/test_util.py rename to ckan/tests/legacy/functional/api/test_util.py index 94de4b4640a..6f5b4ef9f32 100644 --- a/ckan/tests_legacy/functional/api/test_util.py +++ b/ckan/tests/legacy/functional/api/test_util.py @@ -2,8 +2,8 @@ from ckan import model, __version__ from ckan.lib.create_test_data import CreateTestData -from ckan.tests_legacy import TestController as ControllerTestCase -from ckan.tests_legacy import url_for +from ckan.tests.legacy import TestController as ControllerTestCase +from ckan.tests.legacy import url_for from ckan.common import json class TestUtil(ControllerTestCase): diff --git a/ckan/tests/legacy/functional/base.py b/ckan/tests/legacy/functional/base.py new file mode 100644 index 00000000000..b271e984945 --- /dev/null +++ b/ckan/tests/legacy/functional/base.py @@ -0,0 +1,5 @@ +from ckan.tests.legacy.html_check import HtmlCheckMethods +from ckan.tests.legacy import TestController as ControllerTestCase + +class FunctionalTestCase(ControllerTestCase, HtmlCheckMethods): + pass diff --git a/ckan/tests_legacy/functional/test_activity.py b/ckan/tests/legacy/functional/test_activity.py similarity index 98% rename from ckan/tests_legacy/functional/test_activity.py rename to ckan/tests/legacy/functional/test_activity.py index 57e040a4f0c..af724cfef15 100644 --- a/ckan/tests_legacy/functional/test_activity.py +++ b/ckan/tests/legacy/functional/test_activity.py @@ -11,8 +11,8 @@ from ckan.logic.action.update import package_update, resource_update from ckan.logic.action.update import user_update, group_update from ckan.logic.action.delete import package_delete -from ckan.tests_legacy.html_check import HtmlCheckMethods -from ckan.tests_legacy import CreateTestData +from ckan.tests.legacy.html_check import HtmlCheckMethods +from ckan.tests.legacy import CreateTestData class TestActivity(HtmlCheckMethods): """Test the rendering of activity streams into HTML pages. diff --git a/ckan/tests_legacy/functional/test_admin.py b/ckan/tests/legacy/functional/test_admin.py similarity index 98% rename from ckan/tests_legacy/functional/test_admin.py rename to ckan/tests/legacy/functional/test_admin.py index 332dd3d513d..87340f549a9 100644 --- a/ckan/tests_legacy/functional/test_admin.py +++ b/ckan/tests/legacy/functional/test_admin.py @@ -1,5 +1,5 @@ import ckan.model as model -from ckan.tests_legacy import url_for, CreateTestData, WsgiAppCase +from ckan.tests.legacy import url_for, CreateTestData, WsgiAppCase class TestAdminController(WsgiAppCase): @classmethod diff --git a/ckan/tests_legacy/functional/test_error.py b/ckan/tests/legacy/functional/test_error.py similarity index 100% rename from ckan/tests_legacy/functional/test_error.py rename to ckan/tests/legacy/functional/test_error.py diff --git a/ckan/tests_legacy/functional/test_group.py b/ckan/tests/legacy/functional/test_group.py similarity index 98% rename from ckan/tests_legacy/functional/test_group.py rename to ckan/tests/legacy/functional/test_group.py index 468c5de60d8..f42917b63ca 100644 --- a/ckan/tests_legacy/functional/test_group.py +++ b/ckan/tests/legacy/functional/test_group.py @@ -6,13 +6,13 @@ import ckan.model as model import ckan.lib.search as search -from ckan.tests_legacy import setup_test_search_index +from ckan.tests.legacy import setup_test_search_index from ckan import plugins from ckan.lib.create_test_data import CreateTestData from ckan.logic import get_action -from ckan.tests_legacy import * +from ckan.tests.legacy import * from base import FunctionalTestCase -from ckan.tests_legacy import is_search_supported +from ckan.tests.legacy import is_search_supported class TestGroup(FunctionalTestCase): diff --git a/ckan/tests_legacy/functional/test_home.py b/ckan/tests/legacy/functional/test_home.py similarity index 96% rename from ckan/tests_legacy/functional/test_home.py rename to ckan/tests/legacy/functional/test_home.py index f532c09e3be..1c7769a5540 100644 --- a/ckan/tests_legacy/functional/test_home.py +++ b/ckan/tests/legacy/functional/test_home.py @@ -4,10 +4,10 @@ from ckan.controllers.home import HomeController import ckan.model as model -from ckan.tests_legacy import * -from ckan.tests_legacy.html_check import HtmlCheckMethods -from ckan.tests_legacy.pylons_controller import PylonsTestCase -from ckan.tests_legacy import search_related, setup_test_search_index +from ckan.tests.legacy import * +from ckan.tests.legacy.html_check import HtmlCheckMethods +from ckan.tests.legacy.pylons_controller import PylonsTestCase +from ckan.tests.legacy import search_related, setup_test_search_index from ckan.common import c, session diff --git a/ckan/tests_legacy/functional/test_package.py b/ckan/tests/legacy/functional/test_package.py similarity index 99% rename from ckan/tests_legacy/functional/test_package.py rename to ckan/tests/legacy/functional/test_package.py index 22e4e2efb0d..1199cd84b17 100644 --- a/ckan/tests_legacy/functional/test_package.py +++ b/ckan/tests/legacy/functional/test_package.py @@ -5,10 +5,10 @@ from difflib import unified_diff from nose.tools import assert_equal -from ckan.tests_legacy import * -import ckan.tests_legacy as tests -from ckan.tests_legacy.html_check import HtmlCheckMethods -from ckan.tests_legacy.pylons_controller import PylonsTestCase +from ckan.tests.legacy import * +import ckan.tests.legacy as tests +from ckan.tests.legacy.html_check import HtmlCheckMethods +from ckan.tests.legacy.pylons_controller import PylonsTestCase from base import FunctionalTestCase import ckan.model as model from ckan.lib.create_test_data import CreateTestData diff --git a/ckan/tests_legacy/functional/test_pagination.py b/ckan/tests/legacy/functional/test_pagination.py similarity index 98% rename from ckan/tests_legacy/functional/test_pagination.py rename to ckan/tests/legacy/functional/test_pagination.py index 6d8c0c438ab..b89b742d626 100644 --- a/ckan/tests_legacy/functional/test_pagination.py +++ b/ckan/tests/legacy/functional/test_pagination.py @@ -4,7 +4,7 @@ from ckan.lib.create_test_data import CreateTestData import ckan.model as model -from ckan.tests_legacy import TestController, url_for, setup_test_search_index +from ckan.tests.legacy import TestController, url_for, setup_test_search_index def scrape_search_results(response, object_type): assert object_type in ('dataset', 'group_dataset', 'group', 'user') diff --git a/ckan/tests_legacy/functional/test_preview_interface.py b/ckan/tests/legacy/functional/test_preview_interface.py similarity index 98% rename from ckan/tests_legacy/functional/test_preview_interface.py rename to ckan/tests/legacy/functional/test_preview_interface.py index ea215a88036..8d01acddaa2 100644 --- a/ckan/tests_legacy/functional/test_preview_interface.py +++ b/ckan/tests/legacy/functional/test_preview_interface.py @@ -4,7 +4,7 @@ import ckan.logic as l import ckan.model as model import ckan.lib.create_test_data as create_test_data -import ckan.tests_legacy.functional.base as base +import ckan.tests.legacy.functional.base as base import ckan.plugins as plugins import ckan.lib.dictization.model_dictize as model_dictize diff --git a/ckan/tests_legacy/functional/test_related.py b/ckan/tests/legacy/functional/test_related.py similarity index 99% rename from ckan/tests_legacy/functional/test_related.py rename to ckan/tests/legacy/functional/test_related.py index 3783f0a60dd..bb67323520f 100644 --- a/ckan/tests_legacy/functional/test_related.py +++ b/ckan/tests/legacy/functional/test_related.py @@ -2,12 +2,12 @@ from nose.tools import assert_equal, assert_raises -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckan.model as model import ckan.logic as logic import ckan.lib.helpers as h -import ckan.tests_legacy.functional.base as base -import ckan.tests_legacy.functional.api.base as apibase +import ckan.tests.legacy.functional.base as base +import ckan.tests.legacy.functional.api.base as apibase class TestRelatedUI(base.FunctionalTestCase): diff --git a/ckan/tests_legacy/functional/test_revision.py b/ckan/tests/legacy/functional/test_revision.py similarity index 98% rename from ckan/tests_legacy/functional/test_revision.py rename to ckan/tests/legacy/functional/test_revision.py index d951e087388..7d9b2ce6f19 100644 --- a/ckan/tests_legacy/functional/test_revision.py +++ b/ckan/tests/legacy/functional/test_revision.py @@ -1,4 +1,4 @@ -from ckan.tests_legacy import search_related, TestController, CreateTestData, url_for +from ckan.tests.legacy import search_related, TestController, CreateTestData, url_for import ckan.model as model # TODO: purge revisions after creating them diff --git a/ckan/tests_legacy/functional/test_storage.py b/ckan/tests/legacy/functional/test_storage.py similarity index 98% rename from ckan/tests_legacy/functional/test_storage.py rename to ckan/tests/legacy/functional/test_storage.py index 68ecbf6b996..2176bbe328e 100644 --- a/ckan/tests_legacy/functional/test_storage.py +++ b/ckan/tests/legacy/functional/test_storage.py @@ -5,7 +5,7 @@ import ckan.model as model from ckan.config.middleware import make_app -from ckan.tests_legacy import conf_dir, url_for, CreateTestData +from ckan.tests.legacy import conf_dir, url_for, CreateTestData from ckan.controllers.admin import get_sysadmins from ckan.controllers.storage import create_pairtree_marker diff --git a/ckan/tests_legacy/functional/test_tag.py b/ckan/tests/legacy/functional/test_tag.py similarity index 98% rename from ckan/tests_legacy/functional/test_tag.py rename to ckan/tests/legacy/functional/test_tag.py index 9b41fcf6cfe..b0368c4a25d 100644 --- a/ckan/tests_legacy/functional/test_tag.py +++ b/ckan/tests/legacy/functional/test_tag.py @@ -1,6 +1,6 @@ import json -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model HTTP_MOVED_PERMANENTLY = 301 diff --git a/ckan/tests_legacy/functional/test_tracking.py b/ckan/tests/legacy/functional/test_tracking.py similarity index 99% rename from ckan/tests_legacy/functional/test_tracking.py rename to ckan/tests/legacy/functional/test_tracking.py index d3cacba3cac..52fc1696950 100644 --- a/ckan/tests_legacy/functional/test_tracking.py +++ b/ckan/tests/legacy/functional/test_tracking.py @@ -5,7 +5,7 @@ import datetime import routes -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests class TestTracking(object): diff --git a/ckan/tests_legacy/functional/test_user.py b/ckan/tests/legacy/functional/test_user.py similarity index 96% rename from ckan/tests_legacy/functional/test_user.py rename to ckan/tests/legacy/functional/test_user.py index 796ba88c7d1..0b607001e1c 100644 --- a/ckan/tests_legacy/functional/test_user.py +++ b/ckan/tests/legacy/functional/test_user.py @@ -3,10 +3,10 @@ from pylons import config import hashlib -from ckan.tests_legacy import search_related, CreateTestData -from ckan.tests_legacy.html_check import HtmlCheckMethods -from ckan.tests_legacy.pylons_controller import PylonsTestCase -from ckan.tests_legacy.mock_mail_server import SmtpServerHarness +from ckan.tests.legacy import search_related, CreateTestData +from ckan.tests.legacy.html_check import HtmlCheckMethods +from ckan.tests.legacy.pylons_controller import PylonsTestCase +from ckan.tests.legacy.mock_mail_server import SmtpServerHarness import ckan.model as model from base import FunctionalTestCase from ckan.lib.mailer import get_reset_link, create_reset_key diff --git a/ckan/tests_legacy/html_check.py b/ckan/tests/legacy/html_check.py similarity index 100% rename from ckan/tests_legacy/html_check.py rename to ckan/tests/legacy/html_check.py diff --git a/ckan/tests_legacy/lib/__init__.py b/ckan/tests/legacy/lib/__init__.py similarity index 100% rename from ckan/tests_legacy/lib/__init__.py rename to ckan/tests/legacy/lib/__init__.py diff --git a/ckan/tests_legacy/lib/solr/schema-no-version.xml b/ckan/tests/legacy/lib/solr/schema-no-version.xml similarity index 100% rename from ckan/tests_legacy/lib/solr/schema-no-version.xml rename to ckan/tests/legacy/lib/solr/schema-no-version.xml diff --git a/ckan/tests_legacy/lib/solr/schema-wrong-version.xml b/ckan/tests/legacy/lib/solr/schema-wrong-version.xml similarity index 100% rename from ckan/tests_legacy/lib/solr/schema-wrong-version.xml rename to ckan/tests/legacy/lib/solr/schema-wrong-version.xml diff --git a/ckan/tests_legacy/lib/test_accept.py b/ckan/tests/legacy/lib/test_accept.py similarity index 100% rename from ckan/tests_legacy/lib/test_accept.py rename to ckan/tests/legacy/lib/test_accept.py diff --git a/ckan/tests_legacy/lib/test_alphabet_pagination.py b/ckan/tests/legacy/lib/test_alphabet_pagination.py similarity index 98% rename from ckan/tests_legacy/lib/test_alphabet_pagination.py rename to ckan/tests/legacy/lib/test_alphabet_pagination.py index e0c696f10ac..90723b6ad58 100644 --- a/ckan/tests_legacy/lib/test_alphabet_pagination.py +++ b/ckan/tests/legacy/lib/test_alphabet_pagination.py @@ -2,8 +2,8 @@ from nose.tools import assert_equal -from ckan.tests_legacy import * -from ckan.tests_legacy import regex_related +from ckan.tests.legacy import * +from ckan.tests.legacy import regex_related from ckan.lib.create_test_data import CreateTestData from ckan import model import ckan.lib.helpers as h diff --git a/ckan/tests_legacy/lib/test_authenticator.py b/ckan/tests/legacy/lib/test_authenticator.py similarity index 100% rename from ckan/tests_legacy/lib/test_authenticator.py rename to ckan/tests/legacy/lib/test_authenticator.py diff --git a/ckan/tests_legacy/lib/test_cli.py b/ckan/tests/legacy/lib/test_cli.py similarity index 100% rename from ckan/tests_legacy/lib/test_cli.py rename to ckan/tests/legacy/lib/test_cli.py diff --git a/ckan/tests_legacy/lib/test_datapreview.py b/ckan/tests/legacy/lib/test_datapreview.py similarity index 100% rename from ckan/tests_legacy/lib/test_datapreview.py rename to ckan/tests/legacy/lib/test_datapreview.py diff --git a/ckan/tests_legacy/lib/test_dictization.py b/ckan/tests/legacy/lib/test_dictization.py similarity index 99% rename from ckan/tests_legacy/lib/test_dictization.py rename to ckan/tests/legacy/lib/test_dictization.py index 8f86ddf2370..27427446190 100644 --- a/ckan/tests_legacy/lib/test_dictization.py +++ b/ckan/tests/legacy/lib/test_dictization.py @@ -1,4 +1,4 @@ -from ckan.tests_legacy import assert_equal, assert_not_in, assert_in +from ckan.tests.legacy import assert_equal, assert_not_in, assert_in from pprint import pprint, pformat from difflib import unified_diff import ckan.lib.search as search diff --git a/ckan/tests_legacy/lib/test_dictization_schema.py b/ckan/tests/legacy/lib/test_dictization_schema.py similarity index 100% rename from ckan/tests_legacy/lib/test_dictization_schema.py rename to ckan/tests/legacy/lib/test_dictization_schema.py diff --git a/ckan/tests_legacy/lib/test_email_notifications.py b/ckan/tests/legacy/lib/test_email_notifications.py similarity index 100% rename from ckan/tests_legacy/lib/test_email_notifications.py rename to ckan/tests/legacy/lib/test_email_notifications.py diff --git a/ckan/tests_legacy/lib/test_hash.py b/ckan/tests/legacy/lib/test_hash.py similarity index 100% rename from ckan/tests_legacy/lib/test_hash.py rename to ckan/tests/legacy/lib/test_hash.py diff --git a/ckan/tests_legacy/lib/test_helpers.py b/ckan/tests/legacy/lib/test_helpers.py similarity index 99% rename from ckan/tests_legacy/lib/test_helpers.py rename to ckan/tests/legacy/lib/test_helpers.py index 4f06caa3c86..2d7aee0ab8d 100644 --- a/ckan/tests_legacy/lib/test_helpers.py +++ b/ckan/tests/legacy/lib/test_helpers.py @@ -4,7 +4,7 @@ from pylons import config -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.lib.helpers as h diff --git a/ckan/tests_legacy/lib/test_i18n.py b/ckan/tests/legacy/lib/test_i18n.py similarity index 97% rename from ckan/tests_legacy/lib/test_i18n.py rename to ckan/tests/legacy/lib/test_i18n.py index 830c09bd00b..b93e69bc758 100644 --- a/ckan/tests_legacy/lib/test_i18n.py +++ b/ckan/tests/legacy/lib/test_i18n.py @@ -4,7 +4,7 @@ import ckan.lib.i18n -from ckan.tests_legacy.pylons_controller import PylonsTestCase +from ckan.tests.legacy.pylons_controller import PylonsTestCase class TestI18n(PylonsTestCase): diff --git a/ckan/tests_legacy/lib/test_mailer.py b/ckan/tests/legacy/lib/test_mailer.py similarity index 97% rename from ckan/tests_legacy/lib/test_mailer.py rename to ckan/tests/legacy/lib/test_mailer.py index aa6f6166a56..0075d2865b0 100644 --- a/ckan/tests_legacy/lib/test_mailer.py +++ b/ckan/tests/legacy/lib/test_mailer.py @@ -5,8 +5,8 @@ import ckan.model as model import ckan.lib.mailer as mailer -from ckan.tests_legacy.pylons_controller import PylonsTestCase -from ckan.tests_legacy.mock_mail_server import SmtpServerHarness +from ckan.tests.legacy.pylons_controller import PylonsTestCase +from ckan.tests.legacy.mock_mail_server import SmtpServerHarness from ckan.lib.create_test_data import CreateTestData from ckan.lib.base import g diff --git a/ckan/tests_legacy/lib/test_munge.py b/ckan/tests/legacy/lib/test_munge.py similarity index 100% rename from ckan/tests_legacy/lib/test_munge.py rename to ckan/tests/legacy/lib/test_munge.py diff --git a/ckan/tests_legacy/lib/test_navl.py b/ckan/tests/legacy/lib/test_navl.py similarity index 100% rename from ckan/tests_legacy/lib/test_navl.py rename to ckan/tests/legacy/lib/test_navl.py diff --git a/ckan/tests_legacy/lib/test_resource_search.py b/ckan/tests/legacy/lib/test_resource_search.py similarity index 98% rename from ckan/tests_legacy/lib/test_resource_search.py rename to ckan/tests/legacy/lib/test_resource_search.py index 9eb1d8f9f7a..221ebcfbab6 100644 --- a/ckan/tests_legacy/lib/test_resource_search.py +++ b/ckan/tests/legacy/lib/test_resource_search.py @@ -1,8 +1,8 @@ from webob.multidict import UnicodeMultiDict, MultiDict from nose.tools import assert_raises, assert_equal -from ckan.tests_legacy import * -from ckan.tests_legacy import is_search_supported +from ckan.tests.legacy import * +from ckan.tests.legacy import is_search_supported import ckan.lib.search as search from ckan import model from ckan.lib.create_test_data import CreateTestData diff --git a/ckan/tests_legacy/lib/test_simple_search.py b/ckan/tests/legacy/lib/test_simple_search.py similarity index 100% rename from ckan/tests_legacy/lib/test_simple_search.py rename to ckan/tests/legacy/lib/test_simple_search.py diff --git a/ckan/tests_legacy/lib/test_solr_package_search.py b/ckan/tests/legacy/lib/test_solr_package_search.py similarity index 99% rename from ckan/tests_legacy/lib/test_solr_package_search.py rename to ckan/tests/legacy/lib/test_solr_package_search.py index ca621cd8cfc..e19f5984221 100644 --- a/ckan/tests_legacy/lib/test_solr_package_search.py +++ b/ckan/tests/legacy/lib/test_solr_package_search.py @@ -3,8 +3,8 @@ from ckan import model import ckan.lib.search as search -from ckan.tests_legacy import TestController, CreateTestData, setup_test_search_index -from ckan.tests_legacy.lib import check_search_results +from ckan.tests.legacy import TestController, CreateTestData, setup_test_search_index +from ckan.tests.legacy.lib import check_search_results class TestQuery: @@ -396,7 +396,7 @@ def test_1_filtered(self): # TODO: solr is not currently set up to allow partial matches # and extras are not saved as multivalued so this # test will fail. Make multivalued or remove? - from ckan.tests_legacy import SkipTest + from ckan.tests.legacy import SkipTest raise SkipTest self._filtered_search(u'england', ['eng', 'eng_ni', 'uk', 'gb'], 4) diff --git a/ckan/tests_legacy/lib/test_solr_package_search_synchronous_update.py b/ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py similarity index 97% rename from ckan/tests_legacy/lib/test_solr_package_search_synchronous_update.py rename to ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py index 755bdfa1b1c..9e8c50b1514 100644 --- a/ckan/tests_legacy/lib/test_solr_package_search_synchronous_update.py +++ b/ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py @@ -1,8 +1,8 @@ from ckan import model import ckan.lib.search as search -from ckan.tests_legacy import CreateTestData, setup_test_search_index -from ckan.tests_legacy.lib import check_search_results +from ckan.tests.legacy import CreateTestData, setup_test_search_index +from ckan.tests.legacy.lib import check_search_results import json class TestSearchOverallWithSynchronousIndexing: diff --git a/ckan/tests_legacy/lib/test_solr_schema_version.py b/ckan/tests/legacy/lib/test_solr_schema_version.py similarity index 90% rename from ckan/tests_legacy/lib/test_solr_schema_version.py rename to ckan/tests/legacy/lib/test_solr_schema_version.py index 97e4d28b173..0eea57faef4 100644 --- a/ckan/tests_legacy/lib/test_solr_schema_version.py +++ b/ckan/tests/legacy/lib/test_solr_schema_version.py @@ -1,5 +1,5 @@ import os -from ckan.tests_legacy import TestController +from ckan.tests.legacy import TestController class TestSolrSchemaVersionCheck(TestController): @@ -10,7 +10,7 @@ def setup_class(cls): def _get_current_schema(self): - current_schema = os.path.join(self.root_dir,'..','..','config','solr','schema.xml') + current_schema = os.path.join(self.root_dir,'..','..','..','config','solr','schema.xml') return current_schema diff --git a/ckan/tests_legacy/lib/test_solr_search_index.py b/ckan/tests/legacy/lib/test_solr_search_index.py similarity index 97% rename from ckan/tests_legacy/lib/test_solr_search_index.py rename to ckan/tests/legacy/lib/test_solr_search_index.py index 33278a7787f..57beec9d356 100644 --- a/ckan/tests_legacy/lib/test_solr_search_index.py +++ b/ckan/tests/legacy/lib/test_solr_search_index.py @@ -5,7 +5,7 @@ from pylons import config from ckan import model import ckan.lib.search as search -from ckan.tests_legacy import TestController, CreateTestData, setup_test_search_index, is_search_supported +from ckan.tests.legacy import TestController, CreateTestData, setup_test_search_index, is_search_supported class TestSolrConfig(TestController): """ diff --git a/ckan/tests_legacy/lib/test_tag_search.py b/ckan/tests/legacy/lib/test_tag_search.py similarity index 97% rename from ckan/tests_legacy/lib/test_tag_search.py rename to ckan/tests/legacy/lib/test_tag_search.py index 246cd950b63..bbe24688048 100644 --- a/ckan/tests_legacy/lib/test_tag_search.py +++ b/ckan/tests/legacy/lib/test_tag_search.py @@ -1,6 +1,6 @@ from nose.tools import assert_raises -from ckan.tests_legacy import * -from ckan.tests_legacy import is_search_supported +from ckan.tests.legacy import * +from ckan.tests.legacy import is_search_supported import ckan.lib.search as search from ckan import model from ckan.lib.create_test_data import CreateTestData diff --git a/ckan/tests_legacy/logic/__init__.py b/ckan/tests/legacy/logic/__init__.py similarity index 100% rename from ckan/tests_legacy/logic/__init__.py rename to ckan/tests/legacy/logic/__init__.py diff --git a/ckan/tests_legacy/logic/test_action.py b/ckan/tests/legacy/logic/test_action.py similarity index 99% rename from ckan/tests_legacy/logic/test_action.py rename to ckan/tests/legacy/logic/test_action.py index 8a66dafe192..4945e0004cd 100644 --- a/ckan/tests_legacy/logic/test_action.py +++ b/ckan/tests/legacy/logic/test_action.py @@ -13,14 +13,14 @@ from ckan.lib.create_test_data import CreateTestData from ckan.lib.dictization.model_dictize import resource_dictize import ckan.model as model -import ckan.tests_legacy as tests -from ckan.tests_legacy import WsgiAppCase -from ckan.tests_legacy.functional.api import assert_dicts_equal_ignoring_ordering -from ckan.tests_legacy import setup_test_search_index, search_related -from ckan.tests_legacy import StatusCodes +import ckan.tests.legacy as tests +from ckan.tests.legacy import WsgiAppCase +from ckan.tests.legacy.functional.api import assert_dicts_equal_ignoring_ordering +from ckan.tests.legacy import setup_test_search_index, search_related +from ckan.tests.legacy import StatusCodes from ckan.logic import get_action, NotAuthorized from ckan.logic.action import get_domain_object -from ckan.tests_legacy import TestRoles, call_action_api +from ckan.tests.legacy import TestRoles, call_action_api import ckan.lib.search as search from ckan import plugins diff --git a/ckan/tests_legacy/logic/test_auth.py b/ckan/tests/legacy/logic/test_auth.py similarity index 99% rename from ckan/tests_legacy/logic/test_auth.py rename to ckan/tests/legacy/logic/test_auth.py index 525d8f239e5..1741630a8f8 100644 --- a/ckan/tests_legacy/logic/test_auth.py +++ b/ckan/tests/legacy/logic/test_auth.py @@ -1,7 +1,7 @@ import paste from pylons import config import ckan.config.middleware -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests from ckan.logic import get_action import ckan.model as model import ckan.new_authz as new_authz diff --git a/ckan/tests_legacy/logic/test_init.py b/ckan/tests/legacy/logic/test_init.py similarity index 100% rename from ckan/tests_legacy/logic/test_init.py rename to ckan/tests/legacy/logic/test_init.py diff --git a/ckan/tests_legacy/logic/test_member.py b/ckan/tests/legacy/logic/test_member.py similarity index 100% rename from ckan/tests_legacy/logic/test_member.py rename to ckan/tests/legacy/logic/test_member.py diff --git a/ckan/tests_legacy/logic/test_tag.py b/ckan/tests/legacy/logic/test_tag.py similarity index 99% rename from ckan/tests_legacy/logic/test_tag.py rename to ckan/tests/legacy/logic/test_tag.py index 087ce0850a1..c199f5ad250 100644 --- a/ckan/tests_legacy/logic/test_tag.py +++ b/ckan/tests/legacy/logic/test_tag.py @@ -5,8 +5,8 @@ import ckan.model as model from ckan.lib.create_test_data import CreateTestData -from ckan.tests_legacy import WsgiAppCase -from ckan.tests_legacy import StatusCodes +from ckan.tests.legacy import WsgiAppCase +from ckan.tests.legacy import StatusCodes class TestAction(WsgiAppCase): @classmethod diff --git a/ckan/tests_legacy/logic/test_tag_vocab.py b/ckan/tests/legacy/logic/test_tag_vocab.py similarity index 99% rename from ckan/tests_legacy/logic/test_tag_vocab.py rename to ckan/tests/legacy/logic/test_tag_vocab.py index 7f51e76f52c..54d921f8f3e 100644 --- a/ckan/tests_legacy/logic/test_tag_vocab.py +++ b/ckan/tests/legacy/logic/test_tag_vocab.py @@ -2,7 +2,7 @@ import ckan.logic as logic import ckan.logic.converters as converters import ckan.lib.navl.dictization_functions as df -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckan.lib.create_test_data as ctd TEST_VOCAB_NAME = 'test-vocab' diff --git a/ckan/tests_legacy/logic/test_validators.py b/ckan/tests/legacy/logic/test_validators.py similarity index 100% rename from ckan/tests_legacy/logic/test_validators.py rename to ckan/tests/legacy/logic/test_validators.py diff --git a/ckan/tests_legacy/misc/__init__.py b/ckan/tests/legacy/misc/__init__.py similarity index 100% rename from ckan/tests_legacy/misc/__init__.py rename to ckan/tests/legacy/misc/__init__.py diff --git a/ckan/tests_legacy/misc/test_format_text.py b/ckan/tests/legacy/misc/test_format_text.py similarity index 100% rename from ckan/tests_legacy/misc/test_format_text.py rename to ckan/tests/legacy/misc/test_format_text.py diff --git a/ckan/tests_legacy/misc/test_mock_mail_server.py b/ckan/tests/legacy/misc/test_mock_mail_server.py similarity index 90% rename from ckan/tests_legacy/misc/test_mock_mail_server.py rename to ckan/tests/legacy/misc/test_mock_mail_server.py index 3043392dbfd..35b664f31a5 100644 --- a/ckan/tests_legacy/misc/test_mock_mail_server.py +++ b/ckan/tests/legacy/misc/test_mock_mail_server.py @@ -4,8 +4,8 @@ from email.mime.text import MIMEText import hashlib -from ckan.tests_legacy.pylons_controller import PylonsTestCase -from ckan.tests_legacy.mock_mail_server import SmtpServerHarness +from ckan.tests.legacy.pylons_controller import PylonsTestCase +from ckan.tests.legacy.mock_mail_server import SmtpServerHarness from ckan.lib.mailer import mail_recipient class TestMockMailServer(SmtpServerHarness, PylonsTestCase): diff --git a/ckan/tests_legacy/misc/test_sync.py b/ckan/tests/legacy/misc/test_sync.py similarity index 98% rename from ckan/tests_legacy/misc/test_sync.py rename to ckan/tests/legacy/misc/test_sync.py index 88a37cebdc3..570c12eca62 100644 --- a/ckan/tests_legacy/misc/test_sync.py +++ b/ckan/tests/legacy/misc/test_sync.py @@ -6,7 +6,7 @@ from pylons import config import ckan.model as model -from ckan.tests_legacy import * +from ckan.tests.legacy import * from ckan.lib.create_test_data import CreateTestData from ckan.common import json diff --git a/ckan/tests_legacy/mock_mail_server.py b/ckan/tests/legacy/mock_mail_server.py similarity index 100% rename from ckan/tests_legacy/mock_mail_server.py rename to ckan/tests/legacy/mock_mail_server.py diff --git a/ckan/tests_legacy/mock_plugin.py b/ckan/tests/legacy/mock_plugin.py similarity index 100% rename from ckan/tests_legacy/mock_plugin.py rename to ckan/tests/legacy/mock_plugin.py diff --git a/ckan/tests_legacy/models/__init__.py b/ckan/tests/legacy/models/__init__.py similarity index 100% rename from ckan/tests_legacy/models/__init__.py rename to ckan/tests/legacy/models/__init__.py diff --git a/ckan/tests_legacy/models/test_activity.py b/ckan/tests/legacy/models/test_activity.py similarity index 100% rename from ckan/tests_legacy/models/test_activity.py rename to ckan/tests/legacy/models/test_activity.py diff --git a/ckan/tests_legacy/models/test_extras.py b/ckan/tests/legacy/models/test_extras.py similarity index 98% rename from ckan/tests_legacy/models/test_extras.py rename to ckan/tests/legacy/models/test_extras.py index bd3b607f7f8..86bf64f0cfa 100644 --- a/ckan/tests_legacy/models/test_extras.py +++ b/ckan/tests/legacy/models/test_extras.py @@ -1,4 +1,4 @@ -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model diff --git a/ckan/tests_legacy/models/test_follower.py b/ckan/tests/legacy/models/test_follower.py similarity index 100% rename from ckan/tests_legacy/models/test_follower.py rename to ckan/tests/legacy/models/test_follower.py diff --git a/ckan/tests_legacy/models/test_group.py b/ckan/tests/legacy/models/test_group.py similarity index 99% rename from ckan/tests_legacy/models/test_group.py rename to ckan/tests/legacy/models/test_group.py index 1e44555862b..56eda5241e3 100644 --- a/ckan/tests_legacy/models/test_group.py +++ b/ckan/tests/legacy/models/test_group.py @@ -1,4 +1,4 @@ -from ckan.tests_legacy import assert_equal, assert_in, assert_not_in, CreateTestData +from ckan.tests.legacy import assert_equal, assert_in, assert_not_in, CreateTestData import ckan.model as model diff --git a/ckan/tests_legacy/models/test_license.py b/ckan/tests/legacy/models/test_license.py similarity index 100% rename from ckan/tests_legacy/models/test_license.py rename to ckan/tests/legacy/models/test_license.py diff --git a/ckan/tests_legacy/models/test_misc.py b/ckan/tests/legacy/models/test_misc.py similarity index 98% rename from ckan/tests_legacy/models/test_misc.py rename to ckan/tests/legacy/models/test_misc.py index 7dff9d77b06..aa1a87b935f 100644 --- a/ckan/tests_legacy/models/test_misc.py +++ b/ckan/tests/legacy/models/test_misc.py @@ -1,6 +1,6 @@ from nose.tools import assert_equal -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model from ckan.model.misc import escape_sql_like_special_characters diff --git a/ckan/tests_legacy/models/test_package.py b/ckan/tests/legacy/models/test_package.py similarity index 99% rename from ckan/tests_legacy/models/test_package.py rename to ckan/tests/legacy/models/test_package.py index 54fc50f0ca1..48a3943c45b 100644 --- a/ckan/tests_legacy/models/test_package.py +++ b/ckan/tests/legacy/models/test_package.py @@ -1,6 +1,6 @@ from nose.tools import assert_equal -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model # Todo: More domain logic tests e.g. for isopen() and other domain logic. diff --git a/ckan/tests_legacy/models/test_package_relationships.py b/ckan/tests/legacy/models/test_package_relationships.py similarity index 99% rename from ckan/tests_legacy/models/test_package_relationships.py rename to ckan/tests/legacy/models/test_package_relationships.py index 2657644c433..63ba65f2b52 100644 --- a/ckan/tests_legacy/models/test_package_relationships.py +++ b/ckan/tests/legacy/models/test_package_relationships.py @@ -1,4 +1,4 @@ -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model from ckan.lib.create_test_data import CreateTestData diff --git a/ckan/tests_legacy/models/test_purge_revision.py b/ckan/tests/legacy/models/test_purge_revision.py similarity index 98% rename from ckan/tests_legacy/models/test_purge_revision.py rename to ckan/tests/legacy/models/test_purge_revision.py index 2cc9a90ca93..1250bde0649 100644 --- a/ckan/tests_legacy/models/test_purge_revision.py +++ b/ckan/tests/legacy/models/test_purge_revision.py @@ -1,4 +1,4 @@ -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model diff --git a/ckan/tests_legacy/models/test_resource.py b/ckan/tests/legacy/models/test_resource.py similarity index 99% rename from ckan/tests_legacy/models/test_resource.py rename to ckan/tests/legacy/models/test_resource.py index 9d8dbce42e2..22401c00520 100644 --- a/ckan/tests_legacy/models/test_resource.py +++ b/ckan/tests/legacy/models/test_resource.py @@ -1,7 +1,7 @@ from sqlalchemy import MetaData, __version__ as sqav from nose.tools import assert_equal, raises -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model from ckan.lib.create_test_data import CreateTestData diff --git a/ckan/tests_legacy/models/test_revision.py b/ckan/tests/legacy/models/test_revision.py similarity index 97% rename from ckan/tests_legacy/models/test_revision.py rename to ckan/tests/legacy/models/test_revision.py index 837914d7209..4ec41da15a8 100644 --- a/ckan/tests_legacy/models/test_revision.py +++ b/ckan/tests/legacy/models/test_revision.py @@ -2,7 +2,7 @@ from nose.tools import assert_equal -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model # NB Lots of revision tests are part of vdm. No need to repeat those here. diff --git a/ckan/tests_legacy/models/test_user.py b/ckan/tests/legacy/models/test_user.py similarity index 99% rename from ckan/tests_legacy/models/test_user.py rename to ckan/tests/legacy/models/test_user.py index 36074d50059..63e83442f22 100644 --- a/ckan/tests_legacy/models/test_user.py +++ b/ckan/tests/legacy/models/test_user.py @@ -1,6 +1,6 @@ from nose.tools import assert_equal -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model from ckan.lib.create_test_data import CreateTestData diff --git a/ckan/tests_legacy/pylons_controller.py b/ckan/tests/legacy/pylons_controller.py similarity index 98% rename from ckan/tests_legacy/pylons_controller.py rename to ckan/tests/legacy/pylons_controller.py index 43786d6266c..9535e49010c 100644 --- a/ckan/tests_legacy/pylons_controller.py +++ b/ckan/tests/legacy/pylons_controller.py @@ -14,7 +14,7 @@ from routes.util import URLGenerator from ckan.config.routing import make_map -from ckan.tests_legacy import * +from ckan.tests.legacy import * from ckan.lib.cli import MockTranslator class TestPylonsSession(dict): diff --git a/ckan/tests_legacy/schema/__init__.py b/ckan/tests/legacy/schema/__init__.py similarity index 100% rename from ckan/tests_legacy/schema/__init__.py rename to ckan/tests/legacy/schema/__init__.py diff --git a/ckan/tests_legacy/schema/test_schema.py b/ckan/tests/legacy/schema/test_schema.py similarity index 100% rename from ckan/tests_legacy/schema/test_schema.py rename to ckan/tests/legacy/schema/test_schema.py diff --git a/ckan/tests_legacy/test_coding_standards.py b/ckan/tests/legacy/test_coding_standards.py similarity index 83% rename from ckan/tests_legacy/test_coding_standards.py rename to ckan/tests/legacy/test_coding_standards.py index 61667106e3b..f747fc37266 100644 --- a/ckan/tests_legacy/test_coding_standards.py +++ b/ckan/tests/legacy/test_coding_standards.py @@ -25,7 +25,7 @@ import pep8 file_path = os.path.dirname(__file__) -base_path = os.path.abspath(os.path.join(file_path, '..', '..')) +base_path = os.path.abspath(os.path.join(file_path, '..', '..', '..')) def process_directory(directory, ext='.py'): @@ -291,33 +291,33 @@ class TestImportStar(object): 'ckan/migration/versions/064_add_email_last_sent_column.py', 'ckan/migration/versions/065_add_email_notifications_preference.py', 'ckan/plugins/__init__.py', - 'ckan/tests_legacy/functional/api/base.py', - 'ckan/tests_legacy/functional/api/test_api.py', - 'ckan/tests_legacy/functional/api/test_misc.py', - 'ckan/tests_legacy/functional/api/test_package_search.py', - 'ckan/tests_legacy/functional/api/test_resource_search.py', - 'ckan/tests_legacy/functional/api/test_revision_search.py', - 'ckan/tests_legacy/functional/test_group.py', - 'ckan/tests_legacy/functional/test_home.py', - 'ckan/tests_legacy/functional/test_package.py', - 'ckan/tests_legacy/functional/test_package_relationships.py', - 'ckan/tests_legacy/functional/test_tag.py', - 'ckan/tests_legacy/lib/test_alphabet_pagination.py', - 'ckan/tests_legacy/lib/test_helpers.py', - 'ckan/tests_legacy/lib/test_resource_search.py', - 'ckan/tests_legacy/lib/test_tag_search.py', - 'ckan/tests_legacy/misc/test_sync.py', - 'ckan/tests_legacy/models/test_extras.py', - 'ckan/tests_legacy/models/test_misc.py', - 'ckan/tests_legacy/models/test_package.py', - 'ckan/tests_legacy/models/test_package_relationships.py', - 'ckan/tests_legacy/models/test_purge_revision.py', - 'ckan/tests_legacy/models/test_resource.py', - 'ckan/tests_legacy/models/test_revision.py', - 'ckan/tests_legacy/models/test_user.py', - 'ckan/tests_legacy/pylons_controller.py', - 'ckan/tests_legacy/test_dumper.py', - 'ckan/tests_legacy/test_wsgi_ckanclient.py', + 'ckan/tests/legacy/functional/api/base.py', + 'ckan/tests/legacy/functional/api/test_api.py', + 'ckan/tests/legacy/functional/api/test_misc.py', + 'ckan/tests/legacy/functional/api/test_package_search.py', + 'ckan/tests/legacy/functional/api/test_resource_search.py', + 'ckan/tests/legacy/functional/api/test_revision_search.py', + 'ckan/tests/legacy/functional/test_group.py', + 'ckan/tests/legacy/functional/test_home.py', + 'ckan/tests/legacy/functional/test_package.py', + 'ckan/tests/legacy/functional/test_package_relationships.py', + 'ckan/tests/legacy/functional/test_tag.py', + 'ckan/tests/legacy/lib/test_alphabet_pagination.py', + 'ckan/tests/legacy/lib/test_helpers.py', + 'ckan/tests/legacy/lib/test_resource_search.py', + 'ckan/tests/legacy/lib/test_tag_search.py', + 'ckan/tests/legacy/misc/test_sync.py', + 'ckan/tests/legacy/models/test_extras.py', + 'ckan/tests/legacy/models/test_misc.py', + 'ckan/tests/legacy/models/test_package.py', + 'ckan/tests/legacy/models/test_package_relationships.py', + 'ckan/tests/legacy/models/test_purge_revision.py', + 'ckan/tests/legacy/models/test_resource.py', + 'ckan/tests/legacy/models/test_revision.py', + 'ckan/tests/legacy/models/test_user.py', + 'ckan/tests/legacy/pylons_controller.py', + 'ckan/tests/legacy/test_dumper.py', + 'ckan/tests/legacy/test_wsgi_ckanclient.py', 'fabfile.py', ] fails = {} @@ -551,96 +551,96 @@ class TestPep8(object): 'ckan/poo.py', 'ckan/rating.py', 'ckan/templates_legacy/home/__init__.py', - 'ckan/tests_legacy/__init__.py', - 'ckan/tests_legacy/ckantestplugin/ckantestplugin/__init__.py', - 'ckan/tests_legacy/ckantestplugin/setup.py', - 'ckan/tests_legacy/ckantestplugins.py', - 'ckan/tests_legacy/functional/api/base.py', - 'ckan/tests_legacy/functional/api/model/test_group.py', - 'ckan/tests_legacy/functional/api/model/test_licenses.py', - 'ckan/tests_legacy/functional/api/model/test_package.py', - 'ckan/tests_legacy/functional/api/model/test_ratings.py', - 'ckan/tests_legacy/functional/api/model/test_relationships.py', - 'ckan/tests_legacy/functional/api/model/test_revisions.py', - 'ckan/tests_legacy/functional/api/model/test_tag.py', - 'ckan/tests_legacy/functional/api/model/test_vocabulary.py', - 'ckan/tests_legacy/functional/api/test_activity.py', - 'ckan/tests_legacy/functional/api/test_api.py', - 'ckan/tests_legacy/functional/api/test_dashboard.py', - 'ckan/tests_legacy/functional/api/test_email_notifications.py', - 'ckan/tests_legacy/functional/api/test_follow.py', - 'ckan/tests_legacy/functional/api/test_misc.py', - 'ckan/tests_legacy/functional/api/test_package_search.py', - 'ckan/tests_legacy/functional/api/test_resource.py', - 'ckan/tests_legacy/functional/api/test_resource_search.py', - 'ckan/tests_legacy/functional/api/test_revision_search.py', - 'ckan/tests_legacy/functional/api/test_user.py', - 'ckan/tests_legacy/functional/api/test_util.py', - 'ckan/tests_legacy/functional/base.py', - 'ckan/tests_legacy/functional/test_activity.py', - 'ckan/tests_legacy/functional/test_admin.py', - 'ckan/tests_legacy/functional/test_cors.py', - 'ckan/tests_legacy/functional/test_error.py', - 'ckan/tests_legacy/functional/test_home.py', - 'ckan/tests_legacy/functional/test_package.py', - 'ckan/tests_legacy/functional/test_package_relationships.py', - 'ckan/tests_legacy/functional/test_pagination.py', - 'ckan/tests_legacy/functional/test_preview_interface.py', - 'ckan/tests_legacy/functional/test_related.py', - 'ckan/tests_legacy/functional/test_revision.py', - 'ckan/tests_legacy/functional/test_search.py', - 'ckan/tests_legacy/functional/test_storage.py', - 'ckan/tests_legacy/functional/test_tag.py', - 'ckan/tests_legacy/functional/test_tag_vocab.py', - 'ckan/tests_legacy/functional/test_upload.py', - 'ckan/tests_legacy/functional/test_user.py', - 'ckan/tests_legacy/html_check.py', - 'ckan/tests_legacy/lib/__init__.py', - 'ckan/tests_legacy/lib/test_accept.py', - 'ckan/tests_legacy/lib/test_alphabet_pagination.py', - 'ckan/tests_legacy/lib/test_cli.py', - 'ckan/tests_legacy/lib/test_dictization.py', - 'ckan/tests_legacy/lib/test_email_notifications.py', - 'ckan/tests_legacy/lib/test_hash.py', - 'ckan/tests_legacy/lib/test_helpers.py', - 'ckan/tests_legacy/lib/test_i18n.py', - 'ckan/tests_legacy/lib/test_mailer.py', - 'ckan/tests_legacy/lib/test_munge.py', - 'ckan/tests_legacy/lib/test_navl.py', - 'ckan/tests_legacy/lib/test_resource_search.py', - 'ckan/tests_legacy/lib/test_simple_search.py', - 'ckan/tests_legacy/lib/test_solr_package_search.py', - 'ckan/tests_legacy/lib/test_solr_package_search_synchronous_update.py', - 'ckan/tests_legacy/lib/test_solr_schema_version.py', - 'ckan/tests_legacy/lib/test_solr_search_index.py', - 'ckan/tests_legacy/lib/test_tag_search.py', - 'ckan/tests_legacy/logic/test_action.py', - 'ckan/tests_legacy/logic/test_auth.py', - 'ckan/tests_legacy/logic/test_tag.py', - 'ckan/tests_legacy/logic/test_validators.py', - 'ckan/tests_legacy/misc/test_format_text.py', - 'ckan/tests_legacy/misc/test_mock_mail_server.py', - 'ckan/tests_legacy/misc/test_sync.py', - 'ckan/tests_legacy/mock_mail_server.py', - 'ckan/tests_legacy/mock_plugin.py', - 'ckan/tests_legacy/models/test_extras.py', - 'ckan/tests_legacy/models/test_group.py', - 'ckan/tests_legacy/models/test_license.py', - 'ckan/tests_legacy/models/test_misc.py', - 'ckan/tests_legacy/models/test_package.py', - 'ckan/tests_legacy/models/test_package_relationships.py', - 'ckan/tests_legacy/models/test_purge_revision.py', - 'ckan/tests_legacy/models/test_resource.py', - 'ckan/tests_legacy/models/test_revision.py', - 'ckan/tests_legacy/models/test_user.py', - 'ckan/tests_legacy/monkey.py', - 'ckan/tests_legacy/pylons_controller.py', - 'ckan/tests_legacy/schema/test_schema.py', - 'ckan/tests_legacy/test_dumper.py', - 'ckan/tests_legacy/test_plugins.py', - 'ckan/tests_legacy/test_versions.py', - 'ckan/tests_legacy/test_wsgi_ckanclient.py', - 'ckan/tests_legacy/wsgi_ckanclient.py', + 'ckan/tests/legacy/__init__.py', + 'ckan/tests/legacy/ckantestplugin/ckantestplugin/__init__.py', + 'ckan/tests/legacy/ckantestplugin/setup.py', + 'ckan/tests/legacy/ckantestplugins.py', + 'ckan/tests/legacy/functional/api/base.py', + 'ckan/tests/legacy/functional/api/model/test_group.py', + 'ckan/tests/legacy/functional/api/model/test_licenses.py', + 'ckan/tests/legacy/functional/api/model/test_package.py', + 'ckan/tests/legacy/functional/api/model/test_ratings.py', + 'ckan/tests/legacy/functional/api/model/test_relationships.py', + 'ckan/tests/legacy/functional/api/model/test_revisions.py', + 'ckan/tests/legacy/functional/api/model/test_tag.py', + 'ckan/tests/legacy/functional/api/model/test_vocabulary.py', + 'ckan/tests/legacy/functional/api/test_activity.py', + 'ckan/tests/legacy/functional/api/test_api.py', + 'ckan/tests/legacy/functional/api/test_dashboard.py', + 'ckan/tests/legacy/functional/api/test_email_notifications.py', + 'ckan/tests/legacy/functional/api/test_follow.py', + 'ckan/tests/legacy/functional/api/test_misc.py', + 'ckan/tests/legacy/functional/api/test_package_search.py', + 'ckan/tests/legacy/functional/api/test_resource.py', + 'ckan/tests/legacy/functional/api/test_resource_search.py', + 'ckan/tests/legacy/functional/api/test_revision_search.py', + 'ckan/tests/legacy/functional/api/test_user.py', + 'ckan/tests/legacy/functional/api/test_util.py', + 'ckan/tests/legacy/functional/base.py', + 'ckan/tests/legacy/functional/test_activity.py', + 'ckan/tests/legacy/functional/test_admin.py', + 'ckan/tests/legacy/functional/test_cors.py', + 'ckan/tests/legacy/functional/test_error.py', + 'ckan/tests/legacy/functional/test_home.py', + 'ckan/tests/legacy/functional/test_package.py', + 'ckan/tests/legacy/functional/test_package_relationships.py', + 'ckan/tests/legacy/functional/test_pagination.py', + 'ckan/tests/legacy/functional/test_preview_interface.py', + 'ckan/tests/legacy/functional/test_related.py', + 'ckan/tests/legacy/functional/test_revision.py', + 'ckan/tests/legacy/functional/test_search.py', + 'ckan/tests/legacy/functional/test_storage.py', + 'ckan/tests/legacy/functional/test_tag.py', + 'ckan/tests/legacy/functional/test_tag_vocab.py', + 'ckan/tests/legacy/functional/test_upload.py', + 'ckan/tests/legacy/functional/test_user.py', + 'ckan/tests/legacy/html_check.py', + 'ckan/tests/legacy/lib/__init__.py', + 'ckan/tests/legacy/lib/test_accept.py', + 'ckan/tests/legacy/lib/test_alphabet_pagination.py', + 'ckan/tests/legacy/lib/test_cli.py', + 'ckan/tests/legacy/lib/test_dictization.py', + 'ckan/tests/legacy/lib/test_email_notifications.py', + 'ckan/tests/legacy/lib/test_hash.py', + 'ckan/tests/legacy/lib/test_helpers.py', + 'ckan/tests/legacy/lib/test_i18n.py', + 'ckan/tests/legacy/lib/test_mailer.py', + 'ckan/tests/legacy/lib/test_munge.py', + 'ckan/tests/legacy/lib/test_navl.py', + 'ckan/tests/legacy/lib/test_resource_search.py', + 'ckan/tests/legacy/lib/test_simple_search.py', + 'ckan/tests/legacy/lib/test_solr_package_search.py', + 'ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py', + 'ckan/tests/legacy/lib/test_solr_schema_version.py', + 'ckan/tests/legacy/lib/test_solr_search_index.py', + 'ckan/tests/legacy/lib/test_tag_search.py', + 'ckan/tests/legacy/logic/test_action.py', + 'ckan/tests/legacy/logic/test_auth.py', + 'ckan/tests/legacy/logic/test_tag.py', + 'ckan/tests/legacy/logic/test_validators.py', + 'ckan/tests/legacy/misc/test_format_text.py', + 'ckan/tests/legacy/misc/test_mock_mail_server.py', + 'ckan/tests/legacy/misc/test_sync.py', + 'ckan/tests/legacy/mock_mail_server.py', + 'ckan/tests/legacy/mock_plugin.py', + 'ckan/tests/legacy/models/test_extras.py', + 'ckan/tests/legacy/models/test_group.py', + 'ckan/tests/legacy/models/test_license.py', + 'ckan/tests/legacy/models/test_misc.py', + 'ckan/tests/legacy/models/test_package.py', + 'ckan/tests/legacy/models/test_package_relationships.py', + 'ckan/tests/legacy/models/test_purge_revision.py', + 'ckan/tests/legacy/models/test_resource.py', + 'ckan/tests/legacy/models/test_revision.py', + 'ckan/tests/legacy/models/test_user.py', + 'ckan/tests/legacy/monkey.py', + 'ckan/tests/legacy/pylons_controller.py', + 'ckan/tests/legacy/schema/test_schema.py', + 'ckan/tests/legacy/test_dumper.py', + 'ckan/tests/legacy/test_plugins.py', + 'ckan/tests/legacy/test_versions.py', + 'ckan/tests/legacy/test_wsgi_ckanclient.py', + 'ckan/tests/legacy/wsgi_ckanclient.py', 'ckan/websetup.py', 'ckanext/datastore/bin/datastore_setup.py', 'ckanext/datastore/logic/action.py', diff --git a/ckan/tests_legacy/test_dumper.py b/ckan/tests/legacy/test_dumper.py similarity index 99% rename from ckan/tests_legacy/test_dumper.py rename to ckan/tests/legacy/test_dumper.py index 0fdfa99ea53..40b8e0f55d1 100644 --- a/ckan/tests_legacy/test_dumper.py +++ b/ckan/tests/legacy/test_dumper.py @@ -3,7 +3,7 @@ from time import time import ckan -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model import ckan.lib.dumper as dumper from ckan.common import json diff --git a/ckan/tests_legacy/test_plugins.py b/ckan/tests/legacy/test_plugins.py similarity index 100% rename from ckan/tests_legacy/test_plugins.py rename to ckan/tests/legacy/test_plugins.py diff --git a/ckan/tests_legacy/test_versions.py b/ckan/tests/legacy/test_versions.py similarity index 100% rename from ckan/tests_legacy/test_versions.py rename to ckan/tests/legacy/test_versions.py diff --git a/ckan/tests_legacy/test_wsgi_ckanclient.py b/ckan/tests/legacy/test_wsgi_ckanclient.py similarity index 96% rename from ckan/tests_legacy/test_wsgi_ckanclient.py rename to ckan/tests/legacy/test_wsgi_ckanclient.py index 1be7d322a66..49c863635ea 100644 --- a/ckan/tests_legacy/test_wsgi_ckanclient.py +++ b/ckan/tests/legacy/test_wsgi_ckanclient.py @@ -1,6 +1,6 @@ from nose.tools import assert_raises -from ckan.tests_legacy import * +from ckan.tests.legacy import * import ckan.model as model from wsgi_ckanclient import * diff --git a/ckan/tests_legacy/wsgi_ckanclient.py b/ckan/tests/legacy/wsgi_ckanclient.py similarity index 100% rename from ckan/tests_legacy/wsgi_ckanclient.py rename to ckan/tests/legacy/wsgi_ckanclient.py diff --git a/ckan/tests_legacy/functional/base.py b/ckan/tests_legacy/functional/base.py deleted file mode 100644 index 7799eea9537..00000000000 --- a/ckan/tests_legacy/functional/base.py +++ /dev/null @@ -1,5 +0,0 @@ -from ckan.tests_legacy.html_check import HtmlCheckMethods -from ckan.tests_legacy import TestController as ControllerTestCase - -class FunctionalTestCase(ControllerTestCase, HtmlCheckMethods): - pass diff --git a/ckanext/datapusher/tests/test.py b/ckanext/datapusher/tests/test.py index e8b21f75ad3..e951ec8c914 100644 --- a/ckanext/datapusher/tests/test.py +++ b/ckanext/datapusher/tests/test.py @@ -12,7 +12,7 @@ import ckan.plugins as p import ckan.lib.create_test_data as ctd import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckan.config.middleware as middleware import ckanext.datastore.db as db diff --git a/ckanext/datastore/tests/test_create.py b/ckanext/datastore/tests/test_create.py index 5c893da61e1..6659597193a 100644 --- a/ckanext/datastore/tests/test_create.py +++ b/ckanext/datastore/tests/test_create.py @@ -11,7 +11,7 @@ import ckan.plugins as p import ckan.lib.create_test_data as ctd import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckan.config.middleware as middleware import ckan.new_tests.helpers as helpers import ckan.new_tests.factories as factories diff --git a/ckanext/datastore/tests/test_delete.py b/ckanext/datastore/tests/test_delete.py index 49f56bc71f9..e87c66c7bf2 100644 --- a/ckanext/datastore/tests/test_delete.py +++ b/ckanext/datastore/tests/test_delete.py @@ -8,7 +8,7 @@ import ckan.plugins as p import ckan.lib.create_test_data as ctd import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckanext.datastore.db as db from ckanext.datastore.tests.helpers import rebuild_all_dbs, set_url_type diff --git a/ckanext/datastore/tests/test_dump.py b/ckanext/datastore/tests/test_dump.py index bec974765e5..53190240bb6 100644 --- a/ckanext/datastore/tests/test_dump.py +++ b/ckanext/datastore/tests/test_dump.py @@ -10,7 +10,7 @@ import ckan.plugins as p import ckan.lib.create_test_data as ctd import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckanext.datastore.db as db import ckanext.datastore.tests.helpers as helpers diff --git a/ckanext/datastore/tests/test_search.py b/ckanext/datastore/tests/test_search.py index ae21c673954..bc847322fe1 100644 --- a/ckanext/datastore/tests/test_search.py +++ b/ckanext/datastore/tests/test_search.py @@ -8,7 +8,7 @@ import ckan.plugins as p import ckan.lib.create_test_data as ctd import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckanext.datastore.db as db from ckanext.datastore.tests.helpers import extract, rebuild_all_dbs diff --git a/ckanext/datastore/tests/test_unit.py b/ckanext/datastore/tests/test_unit.py index c0590448851..f9caaa2ecf3 100644 --- a/ckanext/datastore/tests/test_unit.py +++ b/ckanext/datastore/tests/test_unit.py @@ -5,7 +5,7 @@ from pylons import config -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckanext.datastore.db as db import ckanext.datastore.plugin as plugin diff --git a/ckanext/datastore/tests/test_upsert.py b/ckanext/datastore/tests/test_upsert.py index 4f3edb41e07..accb06f6647 100644 --- a/ckanext/datastore/tests/test_upsert.py +++ b/ckanext/datastore/tests/test_upsert.py @@ -8,7 +8,7 @@ import ckan.plugins as p import ckan.lib.create_test_data as ctd import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckanext.datastore.db as db from ckanext.datastore.tests.helpers import rebuild_all_dbs, set_url_type diff --git a/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py b/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py index e8f4b013cc5..9ad6788b4fb 100644 --- a/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py +++ b/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py @@ -7,7 +7,7 @@ import webtest import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckan.plugins import ckan.new_tests.factories as factories diff --git a/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py b/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py index 940949c7b4f..4223496a382 100644 --- a/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py +++ b/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py @@ -5,7 +5,7 @@ import webtest import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckan.plugins import ckan.new_tests.factories as factories diff --git a/ckanext/imageview/tests/test_view.py b/ckanext/imageview/tests/test_view.py index e33188f411c..832bed12d46 100644 --- a/ckanext/imageview/tests/test_view.py +++ b/ckanext/imageview/tests/test_view.py @@ -6,7 +6,7 @@ import ckan.lib.helpers as h import ckan.lib.create_test_data as create_test_data import ckan.plugins as p -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests class TestImageView(tests.WsgiAppCase): diff --git a/ckanext/multilingual/tests/test_multilingual_plugin.py b/ckanext/multilingual/tests/test_multilingual_plugin.py index 548a00ec443..ab795084667 100644 --- a/ckanext/multilingual/tests/test_multilingual_plugin.py +++ b/ckanext/multilingual/tests/test_multilingual_plugin.py @@ -4,8 +4,8 @@ import ckan.lib.create_test_data import ckan.logic.action.update import ckan.model as model -import ckan.tests_legacy -import ckan.tests_legacy.html_check +import ckan.tests.legacy +import ckan.tests.legacy.html_check import routes import paste.fixture import pylons.test @@ -13,7 +13,7 @@ _create_test_data = ckan.lib.create_test_data -class TestDatasetTermTranslation(ckan.tests_legacy.html_check.HtmlCheckMethods): +class TestDatasetTermTranslation(ckan.tests.legacy.html_check.HtmlCheckMethods): 'Test the translation of datasets by the multilingual_dataset plugin.' @classmethod def setup(cls): @@ -21,20 +21,20 @@ def setup(cls): ckan.plugins.load('multilingual_dataset') ckan.plugins.load('multilingual_group') ckan.plugins.load('multilingual_tag') - ckan.tests_legacy.setup_test_search_index() + ckan.tests.legacy.setup_test_search_index() _create_test_data.CreateTestData.create_translations_test_data() cls.sysadmin_user = model.User.get('testsysadmin') cls.org = {'name': 'test_org', 'title': 'russian', 'description': 'Roger likes these books.'} - ckan.tests_legacy.call_action_api(cls.app, 'organization_create', + ckan.tests.legacy.call_action_api(cls.app, 'organization_create', apikey=cls.sysadmin_user.apikey, **cls.org) dataset = {'name': 'test_org_dataset', 'title': 'A Novel By Tolstoy', 'owner_org': cls.org['name']} - ckan.tests_legacy.call_action_api(cls.app, 'package_create', + ckan.tests.legacy.call_action_api(cls.app, 'package_create', apikey=cls.sysadmin_user.apikey, **dataset) diff --git a/ckanext/pdfview/tests/test_view.py b/ckanext/pdfview/tests/test_view.py index fd38855fd0b..5e269926f9b 100644 --- a/ckanext/pdfview/tests/test_view.py +++ b/ckanext/pdfview/tests/test_view.py @@ -3,7 +3,7 @@ import urlparse import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckan.plugins as plugins import ckan.lib.helpers as h import ckanext.pdfview.plugin as plugin diff --git a/ckanext/reclineview/tests/test_view.py b/ckanext/reclineview/tests/test_view.py index ced0e765917..2dc08bcfb53 100644 --- a/ckanext/reclineview/tests/test_view.py +++ b/ckanext/reclineview/tests/test_view.py @@ -2,7 +2,7 @@ import pylons.config as config import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckan.plugins as p import ckan.lib.helpers as h import ckanext.reclineview.plugin as plugin diff --git a/ckanext/resourceproxy/tests/test_proxy.py b/ckanext/resourceproxy/tests/test_proxy.py index 14e7be77d95..89f839af595 100644 --- a/ckanext/resourceproxy/tests/test_proxy.py +++ b/ckanext/resourceproxy/tests/test_proxy.py @@ -7,7 +7,7 @@ from pylons import config import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckan.plugins as p import ckan.lib.create_test_data as create_test_data import ckan.config.middleware as middleware diff --git a/ckanext/stats/tests/test_stats_plugin.py b/ckanext/stats/tests/test_stats_plugin.py index ff49e55e776..f6671632f4a 100644 --- a/ckanext/stats/tests/test_stats_plugin.py +++ b/ckanext/stats/tests/test_stats_plugin.py @@ -1,6 +1,6 @@ import os -from ckan.tests_legacy import url_for +from ckan.tests.legacy import url_for from ckanext.stats.tests import StatsFixture diff --git a/ckanext/textview/tests/test_view.py b/ckanext/textview/tests/test_view.py index 476c4e631fb..aa0ac7a2d1d 100644 --- a/ckanext/textview/tests/test_view.py +++ b/ckanext/textview/tests/test_view.py @@ -3,7 +3,7 @@ import urlparse import ckan.model as model -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests import ckan.plugins as plugins import ckan.lib.helpers as h import ckanext.textview.plugin as plugin diff --git a/ckanext/webpageview/tests/test_view.py b/ckanext/webpageview/tests/test_view.py index e33188f411c..832bed12d46 100644 --- a/ckanext/webpageview/tests/test_view.py +++ b/ckanext/webpageview/tests/test_view.py @@ -6,7 +6,7 @@ import ckan.lib.helpers as h import ckan.lib.create_test_data as create_test_data import ckan.plugins as p -import ckan.tests_legacy as tests +import ckan.tests.legacy as tests class TestImageView(tests.WsgiAppCase): diff --git a/setup.py b/setup.py index 398c50febff..bfe131f8d6f 100644 --- a/setup.py +++ b/setup.py @@ -131,18 +131,18 @@ 'webpage_view = ckanext.webpageview.plugin:WebPageView', ], 'ckan.test_plugins': [ - 'routes_plugin = tests_legacy.ckantestplugins:RoutesPlugin', - 'mapper_plugin = tests_legacy.ckantestplugins:MapperPlugin', - 'session_plugin = tests_legacy.ckantestplugins:SessionPlugin', - 'mapper_plugin2 = tests_legacy.ckantestplugins:MapperPlugin2', - 'authorizer_plugin = tests_legacy.ckantestplugins:AuthorizerPlugin', - 'test_observer_plugin = tests_legacy.ckantestplugins:PluginObserverPlugin', - 'action_plugin = tests_legacy.ckantestplugins:ActionPlugin', - 'auth_plugin = tests_legacy.ckantestplugins:AuthPlugin', - 'test_group_plugin = tests_legacy.ckantestplugins:MockGroupControllerPlugin', - 'test_package_controller_plugin = tests_legacy.ckantestplugins:MockPackageControllerPlugin', - 'test_resource_preview = tests_legacy.ckantestplugins:MockResourcePreviewExtension', - 'test_json_resource_preview = tests_legacy.ckantestplugins:JsonMockResourcePreviewExtension', + 'routes_plugin = tests.legacy.ckantestplugins:RoutesPlugin', + 'mapper_plugin = tests.legacy.ckantestplugins:MapperPlugin', + 'session_plugin = tests.legacy.ckantestplugins:SessionPlugin', + 'mapper_plugin2 = tests.legacy.ckantestplugins:MapperPlugin2', + 'authorizer_plugin = tests.legacy.ckantestplugins:AuthorizerPlugin', + 'test_observer_plugin = tests.legacy.ckantestplugins:PluginObserverPlugin', + 'action_plugin = tests.legacy.ckantestplugins:ActionPlugin', + 'auth_plugin = tests.legacy.ckantestplugins:AuthPlugin', + 'test_group_plugin = tests.legacy.ckantestplugins:MockGroupControllerPlugin', + 'test_package_controller_plugin = tests.legacy.ckantestplugins:MockPackageControllerPlugin', + 'test_resource_preview = tests.legacy.ckantestplugins:MockResourcePreviewExtension', + 'test_json_resource_preview = tests.legacy.ckantestplugins:JsonMockResourcePreviewExtension', 'sample_datastore_plugin = ckanext.datastore.tests.sample_datastore_plugin:SampleDataStorePlugin' ], 'babel.extractors': [