test_revision_legacy_code is tested outside of the main run

Also, activity_streams_session_extension is removed as no longer used

.circleci/config.yml

@@ -77,6 +77,14 @@ jobs:
       - store_test_results:
           path: ~/junit
 
+      # test_revision_legacy_code is run separately because it mucks up the model for some other tests when nose starts up
+      - run:
+          command: |
+            case $CIRCLE_NODE_INDEX in
+              3) nosetests -v --ckan --with-pylons=test-core-circle-ci.ini --nologcapture test_revision_legacy_code.py
+              ;;
+            esac
+
       # Tests Frontend, only in one container
       - run:
           command: |

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']
 

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

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',

doc/contributing/test.rst

@@ -122,7 +122,7 @@ To run CKAN's tests using PostgreSQL as the database, you have to give the
 ``--with-pylons=test-core.ini`` option on the command line. This command will
 run the tests for CKAN core and for the core extensions::
 
-     nosetests --ckan --with-pylons=test-core.ini ckan ckanext
+     nosetests --ckan --with-pylons=test-core.ini ckan ckanext test_revision_legacy_code
 
 The speed of the PostgreSQL tests can be improved by running PostgreSQL in
 memory and turning off durability, as described

ckan/tests/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