test_revision_legacy_code is tested last. activity_streams_session_ex…

…tension is unused
ckan · Oct 29, 2019 · 75c24db · 75c24db
1 parent 5f8bacf
commit 75c24db
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 128 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
           CKAN_POSTGRES_PWD: pass
           PGPASSWORD: ckan
           NODE_TESTS_CONTAINER: 2
-          NOSETEST_COMMON_OPTIONS: -v --ckan --reset-db --with-pylons=test-core-circle-ci.ini --nologcapture --with-coverage --cover-package=ckan --cover-package=ckanext --with-xunit --xunit-file=/root/junit/junit.xml ckan ckanext
+          NOSETEST_COMMON_OPTIONS: -v --ckan --reset-db --with-pylons=test-core-circle-ci.ini --nologcapture --with-coverage --cover-package=ckan --cover-package=ckanext --with-xunit --xunit-file=/root/junit/junit.xml ckan ckanext test_revision_legacy_code
       - image: postgres:10
         environment:
           POSTGRES_USER: ckan

diff --git a/ckan/lib/activity_streams_session_extension.py b/ckan/lib/activity_streams_session_extension.py
diff --git a/ckan/model/meta.py b/ckan/model/meta.py
@@ -10,7 +10,6 @@
 from sqlalchemy.orm.session import SessionExtension
 
 import extension
-import ckan.lib.activity_streams_session_extension as activity
 
 __all__ = ['Session', 'engine_is_sqlite', 'engine_is_pg']
 

diff --git a/ckan/tests/legacy/functional/api/test_follow.py b/ckan/tests/legacy/functional/api/test_follow.py
@@ -17,6 +17,10 @@
 from ckan.tests.legacy import are_foreign_keys_supported, SkipTest, CreateTestData, call_action_api
 import ckan.tests.helpers as helpers
 
+# TEMPORARY
+# import ckan.migration.revision_legacy_code
+
+
 def datetime_from_string(s):
     '''Return a standard datetime.datetime object initialised from a string in
     the same format used for timestamps in dictized activities (the format

diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py
@@ -562,7 +562,7 @@ def find_unprefixed_string_literals(filename):
     u'ckan/tests/logic/test_schema.py',
     u'ckan/tests/logic/test_validators.py',
     u'ckan/tests/migration/__init__.py',
-    u'ckan/tests/migration/test_revision_legacy_code.py',
+    u'test_revision_legacy_code.py',
     u'ckan/tests/model/__init__.py',
     u'ckan/tests/model/test_license.py',
     u'ckan/tests/model/test_resource.py',

diff --git a/...ts/migration/test_revision_legacy_code.py → test_revision_legacy_code.py b/...ts/migration/test_revision_legacy_code.py → test_revision_legacy_code.py
@@ -1,5 +1,9 @@
 # encoding: utf-8
 
+# This file is at the top of the ckan repository, because it needs to be run
+# after all the other tests, because it mucks about with the model.
+
+
 from difflib import unified_diff
 from pprint import pprint, pformat