test_revision_legacy_code is tested outside of the main run

Also, activity_streams_session_extension is removed as no longer used

Author: David Read

.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/lib/activity_streams_session_extension.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/model/meta.py

@@ -456,7 +456,7 @@ class TestPep8(object):
         'ckan/tests/legacy/schema/test_schema.py',
         'ckan/tests/legacy/test_plugins.py',
         'ckan/tests/legacy/test_versions.py',
-        'ckan/tests/migration/test_revision_legacy_code.py',
+        'test_revision_legacy_code.py',
         'ckan/websetup.py',
         'ckanext/datastore/bin/datastore_setup.py',
         'ckanext/datastore/logic/action.py',

ckan/tests/legacy/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',

ckan/tests/test_coding_standards.py

@@ -1,5 +1,10 @@
 # encoding: utf-8
 
+# This file is at the top of the ckan repository, because it needs to be run
+# separately from all the other tests, because when it imports
+# revision_legacy_code.py it changes the core model, which causes a number of
+# test failures which we're not concerned about.
+
 from difflib import unified_diff
 from pprint import pprint, pformat