From e6705332fac5b0c97f6ac657887e525d9e07ca51 Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Wed, 23 Aug 2017 11:40:09 +0100
Subject: [PATCH 1/5] [#3760] Auto generate a Flask test request context when
 calling url_for

This is an attempt to try to avoid having to explicitly generate a Flask
request context on all tests that involve url_for.

There are two scenarios when url_for is called outside the context of a
web request: tests and CLI.

The idea is to provide a fallback test request context on url_for if there
isn't one available. On tests, we have the added complexity that tests can
modify the configuration and plugins loaded so we can't reuse the same.

This is an ugly patch, as it uses to global variables. For CLI commands
there's a test request context created on `load_config`, which all
commands should run on startup.

For tests, the only safe place to create it is at the lowest level, on
`make_app`, as soon as the environment is loaded and there is a Flask
app available. Of course this only works if the tests create a test web
app, but that is the most common scenario (eg `FunctionalTestBase` or
any test that creates its own app).

Other tests can create their own test request context if needeed.
---
 ckan/config/middleware/__init__.py |  9 ++++++++
 ckan/lib/cli.py                    | 17 ++++++++++++---
 ckan/lib/helpers.py                | 35 ++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/ckan/config/middleware/__init__.py b/ckan/config/middleware/__init__.py
index 0b14a8c7e05..a6ec785ce4d 100644
--- a/ckan/config/middleware/__init__.py
+++ b/ckan/config/middleware/__init__.py
@@ -39,6 +39,10 @@ def custom_charset__set(self, charset):
 
 # End of webob.requests.BaseRequest monkey patch
 
+# This is a test Flask request context to be used internally.
+# Do not use it!
+_internal_test_request_context = None
+
 
 def make_app(conf, full_stack=True, static_files=True, **app_conf):
     '''
@@ -55,6 +59,11 @@ def make_app(conf, full_stack=True, static_files=True, **app_conf):
     app = AskAppDispatcherMiddleware({'pylons_app': pylons_app,
                                       'flask_app': flask_app})
 
+    # Set this internal test request context with the configured environment so
+    # it can be used when calling url_for from tests
+    global _internal_test_request_context
+    _internal_test_request_context = flask_app._wsgi_app.test_request_context()
+
     return app
 
 
diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py
index 7040c8afbdd..1fbe55bc3fb 100644
--- a/ckan/lib/cli.py
+++ b/ckan/lib/cli.py
@@ -28,11 +28,16 @@
 import ckan.include.rcssmin as rcssmin
 import ckan.plugins as p
 from ckan.common import config
+from ckan.tests.helpers import _get_test_app
 
+# This is a test Flask request context to be used internally.
+# Do not use it!
+_cli_test_request_context = None
 
-#NB No CKAN imports are allowed until after the config file is loaded.
-#   i.e. do the imports in methods, after _load_config is called.
-#   Otherwise loggers get disabled.
+
+# NB No CKAN imports are allowed until after the config file is loaded.
+#    i.e. do the imports in methods, after _load_config is called.
+#    Otherwise loggers get disabled.
 
 
 def deprecation_warning(message=None):
@@ -224,6 +229,12 @@ def load_config(config, load_site_user=True):
     from ckan.config.environment import load_environment
     load_environment(conf.global_conf, conf.local_conf)
 
+    # Set this internal test request context with the configured environment so
+    # it can be used when calling url_for from the CLI.
+    global _cli_test_request_context
+    flask_app = _get_test_app().flask_app
+    _cli_test_request_context = flask_app.test_request_context()
+
     registry = Registry()
     registry.prepare()
     import pylons
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index a701ef5ae81..d0268cc78da 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -28,6 +28,7 @@
 from pylons import url as _pylons_default_url
 from ckan.common import config, is_flask_request
 from flask import redirect as _flask_redirect
+from flask import _request_ctx_stack, current_app
 from routes import redirect_to as _routes_redirect_to
 from routes import url_for as _routes_default_url_for
 from flask import url_for as _flask_default_url_for
@@ -201,6 +202,30 @@ def get_site_protocol_and_host():
     return (None, None)
 
 
+def _get_auto_flask_context():
+    '''
+    Provides a Flask test request context if we are outside the context
+    of a web request (tests or CLI)
+    '''
+
+    from ckan.config.middleware import _internal_test_request_context
+    from ckan.lib.cli import _cli_test_request_context
+
+    # This is a normal web request, there is a request context present
+    if _request_ctx_stack.top:
+        return None
+
+    # We are outside a web request. A test web application was created
+    # (and with it a test request context with the relevant configuration)
+    if _internal_test_request_context:
+        return _internal_test_request_context
+
+    # We are outside a web request. This is a CLI command. A test request
+    # context was created when setting it up
+    if _cli_test_request_context:
+        return _cli_test_request_context
+
+
 @core_helper
 def url_for(*args, **kw):
     '''Return the URL for an endpoint given some parameters.
@@ -252,13 +277,23 @@ def url_for(*args, **kw):
         ver = kw.get('ver')
         if not ver:
             raise Exception('API URLs must specify the version (eg ver=3)')
+
+    _auto_flask_context = _get_auto_flask_context()
+
     try:
+        if _auto_flask_context:
+            _auto_flask_context.push()
+
         # First try to build the URL with the Flask router
         my_url = _url_for_flask(*args, **kw)
 
     except FlaskRouteBuildError:
+
         # If it doesn't succeed, fallback to the Pylons router
         my_url = _url_for_pylons(*args, **kw)
+    finally:
+        if _auto_flask_context:
+            _auto_flask_context.pop()
 
     # Add back internal params
     kw['__ckan_no_root'] = no_root

From 88711e9a3c2f0f9a772cf646570a95f33165f642 Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Wed, 23 Aug 2017 11:56:53 +0100
Subject: [PATCH 2/5] Revert "[#3196] Fix legacy tests dependant on url_for"

This reverts commit 2d83e0d1366a76c8f83fd316301b9976f38fab62.
---
 ckan/tests/controllers/test_package.py        |   4 +-
 ckan/tests/legacy/__init__.py                 |   5 +-
 ckan/tests/legacy/functional/api/base.py      |   2 +-
 .../functional/api/model/test_package.py      |  23 ++--
 .../api/model/test_relationships.py           |  16 +--
 .../functional/api/model/test_vocabulary.py   |   6 +-
 .../legacy/functional/api/test_activity.py    |   4 +-
 .../legacy/functional/api/test_dashboard.py   |   4 +-
 .../api/test_email_notifications.py           |  13 ++-
 .../legacy/functional/api/test_follow.py      |   8 +-
 .../legacy/functional/api/test_resource.py    |   4 +-
 ckan/tests/legacy/functional/api/test_user.py |  29 ++---
 ckan/tests/legacy/functional/api/test_util.py |  62 +++--------
 ckan/tests/legacy/functional/test_activity.py |  14 +--
 ckan/tests/legacy/functional/test_admin.py    |   3 +-
 ckan/tests/legacy/functional/test_group.py    |  14 +--
 ckan/tests/legacy/functional/test_package.py  |  66 +++--------
 .../legacy/functional/test_pagination.py      |  47 ++------
 .../functional/test_preview_interface.py      |  32 +++---
 ckan/tests/legacy/functional/test_revision.py |  12 +-
 ckan/tests/legacy/functional/test_tag.py      |  25 +----
 ckan/tests/legacy/functional/test_tracking.py |  54 +++------
 ckan/tests/legacy/functional/test_user.py     |  49 +++------
 ckan/tests/legacy/html_check.py               |  10 +-
 .../legacy/lib/test_alphabet_pagination.py    |   5 +-
 ckan/tests/legacy/logic/test_action.py        |  23 ++--
 ckan/tests/legacy/logic/test_auth.py          |   7 +-
 ckan/tests/legacy/misc/test_format_text.py    | 103 +++++-------------
 ckan/tests/legacy/models/test_package.py      |   9 +-
 ckan/tests/legacy/test_coding_standards.py    |   2 +-
 30 files changed, 200 insertions(+), 455 deletions(-)

diff --git a/ckan/tests/controllers/test_package.py b/ckan/tests/controllers/test_package.py
index 5421c605d70..845bd3d45c3 100644
--- a/ckan/tests/controllers/test_package.py
+++ b/ckan/tests/controllers/test_package.py
@@ -734,7 +734,7 @@ def test_delete_on_non_existing_dataset(self):
 
         with app.flask_app.test_request_context():
             url = url_for(controller='package', action='delete',
-                          id='schrodingersdatset')
+                    id='schrodingersdatset')
 
         response = app.post(
             url,
@@ -1857,7 +1857,7 @@ def test_package_unfollow(self):
 
         with app.flask_app.test_request_context():
             follow_url = url_for(controller='package',
-                                 action='follow',
+                                action='follow',
                                  id=package['id'])
         app.post(follow_url, extra_environ=env, status=302)
 
diff --git a/ckan/tests/legacy/__init__.py b/ckan/tests/legacy/__init__.py
index a647c147899..3a056855f95 100644
--- a/ckan/tests/legacy/__init__.py
+++ b/ckan/tests/legacy/__init__.py
@@ -35,7 +35,6 @@
 import ckan.model as model
 from ckan import ckan_nose_plugin
 from ckan.common import json
-from ckan.tests import helpers
 
 # evil hack as url_for is passed out
 url_for = h.url_for
@@ -238,8 +237,7 @@ class WsgiAppCase(BaseCase):
     # Either that, or this file got imported somehow before the tests started
     # running, meaning the pylonsapp wasn't setup yet (which is done in
     # pylons.test.py:begin())
-    #app = paste.fixture.TestApp(wsgiapp)
-    app = helpers._get_test_app()
+    app = paste.fixture.TestApp(wsgiapp)
 
 
 def config_abspath(file_path):
@@ -417,7 +415,6 @@ def call_action_api(app, action, apikey=None, status=200, **kwargs):
     params = json.dumps(kwargs)
     response = app.post('/api/action/{0}'.format(action), params=params,
             extra_environ={'Authorization': str(apikey)}, status=status)
-
     assert '/api/3/action/help_show?name={0}'.format(action) \
         in response.json['help']
 
diff --git a/ckan/tests/legacy/functional/api/base.py b/ckan/tests/legacy/functional/api/base.py
index 6278e95077a..98c704ee979 100644
--- a/ckan/tests/legacy/functional/api/base.py
+++ b/ckan/tests/legacy/functional/api/base.py
@@ -190,7 +190,7 @@ def loads(self, chars):
             raise Exception, "Couldn't loads string '%s': %s" % (chars, inst)
 
     def assert_json_response(self, res, expected_in_body=None):
-        content_type = res.headers['Content-Type']
+        content_type = res.header_dict['Content-Type']
         assert 'application/json' in content_type, content_type
         res_json = self.loads(res.body)
         if expected_in_body:
diff --git a/ckan/tests/legacy/functional/api/model/test_package.py b/ckan/tests/legacy/functional/api/model/test_package.py
index 593f49d7612..22472d7dac3 100644
--- a/ckan/tests/legacy/functional/api/model/test_package.py
+++ b/ckan/tests/legacy/functional/api/model/test_package.py
@@ -13,7 +13,6 @@
 from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase
 
 import ckan.tests.legacy as tests
-from ckan.tests import helpers
 
 # Todo: Remove this ckan.model stuff.
 import ckan.model as model
@@ -66,7 +65,7 @@ def test_register_post_ok(self):
         assert_equal(pkg['extras'], self.package_fixture_data['extras'])
 
         # Check the value of the Location header.
-        location = res.headers['Location']
+        location = res.header('Location')
 
         assert offset in location
         res = self.app.get(location, status=self.STATUS_200_OK)
@@ -134,7 +133,7 @@ def test_register_post_with_group(self):
         package_fixture_data = self.package_fixture_data
         package_fixture_data['groups'] = groups
         data = self.dumps(package_fixture_data)
-        res = self.app.post(offset, data, status=self.STATUS_201_CREATED,
+        res = self.post_json(offset, data, status=self.STATUS_201_CREATED,
                              extra_environ={'Authorization':str(user.apikey)})
 
         # Check the database record.
@@ -160,7 +159,7 @@ def test_register_post_with_group_not_authorized(self):
         package_fixture_data = self.package_fixture_data
         package_fixture_data['groups'] = groups
         data = self.dumps(package_fixture_data)
-        res = self.app.post(offset, data, status=self.STATUS_403_ACCESS_DENIED,
+        res = self.post_json(offset, data, status=self.STATUS_403_ACCESS_DENIED,
                              extra_environ=self.extra_environ)
         del package_fixture_data['groups']
 
@@ -174,7 +173,7 @@ def test_register_post_with_group_not_found(self):
         package_fixture_data = self.package_fixture_data
         package_fixture_data['groups'] = groups
         data = self.dumps(package_fixture_data)
-        res = self.app.post(offset, data, status=self.STATUS_404_NOT_FOUND,
+        res = self.post_json(offset, data, status=self.STATUS_404_NOT_FOUND,
                              extra_environ=self.extra_environ)
         del package_fixture_data['groups']
 
@@ -188,7 +187,7 @@ def test_register_post_with_group_sysadmin(self):
         package_fixture_data = self.package_fixture_data
         package_fixture_data['groups'] = groups
         data = self.dumps(package_fixture_data)
-        res = self.app.post(offset, data, status=self.STATUS_201_CREATED,
+        res = self.post_json(offset, data, status=self.STATUS_201_CREATED,
                               extra_environ={'Authorization':str(user.apikey)})
         # Check the database record.
         model.Session.remove()
@@ -208,7 +207,7 @@ def test_register_post_json(self):
         assert not self.get_package_by_name(self.package_fixture_data['name'])
         offset = self.package_offset()
         data = self.dumps(self.package_fixture_data)
-        res = self.app.post(offset, data, status=self.STATUS_201_CREATED,
+        res = self.post_json(offset, data, status=self.STATUS_201_CREATED,
                              extra_environ=self.admin_extra_environ)
         # Check the database record.
         model.Session.remove()
@@ -220,7 +219,7 @@ def test_register_post_bad_content_type(self):
         assert not self.get_package_by_name(self.package_fixture_data['name'])
         offset = self.package_offset()
         data = self.dumps(self.package_fixture_data)
-        res = self.app.post(offset, data,
+        res = self.http_request(offset, data,
                                 content_type='something/unheard_of',
                                 status=[self.STATUS_400_BAD_REQUEST,
                                         self.STATUS_201_CREATED],
@@ -263,7 +262,7 @@ def test_register_post_indexerror(self):
             offset = self.package_offset()
             data = self.dumps(self.package_fixture_data)
 
-            self.app.post(offset, data, status=500, extra_environ=self.admin_extra_environ)
+            self.post_json(offset, data, status=500, extra_environ=self.admin_extra_environ)
             model.Session.remove()
         finally:
             SolrSettings.init(original_settings)
@@ -274,7 +273,7 @@ def test_register_post_tag_too_long(self):
         assert not self.get_package_by_name(pkg['name'])
         offset = self.package_offset()
         data = self.dumps(pkg)
-        res = self.app.post(offset, data, status=self.STATUS_409_CONFLICT,
+        res = self.post_json(offset, data, status=self.STATUS_409_CONFLICT,
                              extra_environ=self.admin_extra_environ)
         assert 'length is more than maximum 100' in res.body, res.body
         assert 'tagok' not in res.body
@@ -715,8 +714,8 @@ def test_entity_delete_ok_without_request_headers(self):
         assert self.get_package_by_name(self.package_fixture_data['name'])
         # delete it
         offset = self.package_offset(self.package_fixture_data['name'])
-        res = self.app.delete(offset, status=self.STATUS_200_OK,
-                              extra_environ=self.admin_extra_environ)
+        res = self.delete_request(offset, status=self.STATUS_200_OK,
+                                  extra_environ=self.admin_extra_environ)
         package = self.get_package_by_name(self.package_fixture_data['name'])
         self.assert_equal(package.state, 'deleted')
         model.Session.remove()
diff --git a/ckan/tests/legacy/functional/api/model/test_relationships.py b/ckan/tests/legacy/functional/api/model/test_relationships.py
index 069776d663d..0bdc30c84e5 100644
--- a/ckan/tests/legacy/functional/api/model/test_relationships.py
+++ b/ckan/tests/legacy/functional/api/model/test_relationships.py
@@ -1,14 +1,14 @@
 # encoding: utf-8
 
-from nose.tools import assert_equal
+from nose.tools import assert_equal 
 from nose.plugins.skip import SkipTest
 
 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 Api1TestCase as Version1TestCase 
+from ckan.tests.legacy.functional.api.base import Api2TestCase as Version2TestCase 
 
 class RelationshipsTestCase(BaseModelApiTestCase):
 
@@ -115,7 +115,7 @@ def test_01_create_and_read_relationship(self):
         assert len(rels) == 1
         self.check_relationship_dict(rels[0],
                'annakarenina', 'parent_of', 'warandpeace', self.comment)
-
+        
     def test_02_create_relationship_way_2(self):
         # Create a relationship using 2nd way
         self.create_annakarenina_parent_of_war_and_peace(way=2)
@@ -189,7 +189,7 @@ def test_create_relationship_unknown(self):
     def create_annakarenina_parent_of_war_and_peace(self, way=1):
         # Create package relationship.
         # More than one 'way' to create a package.
-        # Todo: Redesign this in a RESTful style, so that a relationship is
+        # Todo: Redesign this in a RESTful style, so that a relationship is 
         # created by posting a relationship to a relationship **register**.
         assert way in (1, 2, 3, 4)
         if way == 1:
@@ -220,7 +220,7 @@ def create_annakarenina_parent_of_war_and_peace(self, way=1):
         assert_equal(rel['type'], 'child_of')
         assert_equal(rel['subject'], self.ref_package(self.war))
         assert_equal(rel['object'], self.ref_package(self.anna))
-
+        
         # Check the model, directly.
         rels = self.anna.get_relationships()
         assert len(rels) == 1, rels
@@ -271,7 +271,7 @@ def get_relationships(self, package1_name=u'annakarenina', type='relationships',
         if type:
             allowable_statuses.append(404)
         res = self.app.get(offset, status=allowable_statuses)
-        if res.status_int == 200:
+        if res.status == 200:
             res_dict = self.data_from_res(res) if res.body else []
             return res_dict
         else:
@@ -300,7 +300,7 @@ def check_relationships_rest(self, pkg1_name, pkg2_name=None,
                                  expected_relationships=[]):
         rels = self.get_relationships(package1_name=pkg1_name,
                                       package2_name=pkg2_name)
-        self.assert_len_relationships(rels, expected_relationships)
+        self.assert_len_relationships(rels, expected_relationships) 
         for rel in rels:
             the_expected_rel = None
             for expected_rel in expected_relationships:
diff --git a/ckan/tests/legacy/functional/api/model/test_vocabulary.py b/ckan/tests/legacy/functional/api/model/test_vocabulary.py
index ab6bb25f6f2..feb03af3717 100644
--- a/ckan/tests/legacy/functional/api/model/test_vocabulary.py
+++ b/ckan/tests/legacy/functional/api/model/test_vocabulary.py
@@ -1,17 +1,17 @@
 # encoding: utf-8
 
 import ckan
+import pylons.test
+import paste.fixture
 import ckan.lib.helpers as helpers
 import ckan.lib.dictization.model_dictize as model_dictize
 
-from ckan.tests import helpers as test_helpers
-
 
 class TestVocabulary(object):
 
     @classmethod
     def setup_class(self):
-        self.app = test_helpers._get_test_app()
+        self.app = paste.fixture.TestApp(pylons.test.pylonsapp)
 
     @classmethod
     def teardown_class(self):
diff --git a/ckan/tests/legacy/functional/api/test_activity.py b/ckan/tests/legacy/functional/api/test_activity.py
index 571c8ae4701..ffb9834de08 100644
--- a/ckan/tests/legacy/functional/api/test_activity.py
+++ b/ckan/tests/legacy/functional/api/test_activity.py
@@ -23,8 +23,6 @@
 import ckan.tests.legacy as tests
 from ckan.tests.helpers import call_action
 
-from ckan.tests import helpers
-
 
 ##def package_update(context, data_dict):
 ##    # These tests call package_update directly which is really bad
@@ -208,7 +206,7 @@ def setup_class(self):
                 'id': annakarenina.id,
                 }
         self.users = [self.sysadmin_user, self.normal_user]
-        self.app = helpers._get_test_app()
+        self.app = paste.fixture.TestApp(pylons.test.pylonsapp)
 
     @classmethod
     def teardown_class(self):
diff --git a/ckan/tests/legacy/functional/api/test_dashboard.py b/ckan/tests/legacy/functional/api/test_dashboard.py
index e3a7c4b521e..1dec5c9cbd2 100644
--- a/ckan/tests/legacy/functional/api/test_dashboard.py
+++ b/ckan/tests/legacy/functional/api/test_dashboard.py
@@ -12,8 +12,6 @@
 import paste
 import pylons.test
 from ckan.tests.legacy import CreateTestData
-from ckan.tests import helpers
-
 
 class TestDashboard(object):
     '''Tests for the logic action functions related to the user's dashboard.'''
@@ -37,7 +35,7 @@ def setup_class(cls):
         ckan.model.repo.rebuild_db()
         ckan.lib.search.clear_all()
         CreateTestData.create()
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(pylons.test.pylonsapp)
         joeadmin = ckan.model.User.get('joeadmin')
         cls.joeadmin = {
                 'id': joeadmin.id,
diff --git a/ckan/tests/legacy/functional/api/test_email_notifications.py b/ckan/tests/legacy/functional/api/test_email_notifications.py
index 8ecee84a549..cfc5d417395 100644
--- a/ckan/tests/legacy/functional/api/test_email_notifications.py
+++ b/ckan/tests/legacy/functional/api/test_email_notifications.py
@@ -10,12 +10,13 @@
 import ckan.tests.legacy.pylons_controller as pylons_controller
 import ckan.config.middleware
 
-from ckan.tests import helpers
+import paste
+import paste.deploy
+import pylons.test
 
 from ckan.common import config
 
 
-
 class TestEmailNotifications(mock_mail_server.SmtpServerHarness,
         pylons_controller.PylonsTestCase):
 
@@ -24,7 +25,7 @@ def setup_class(cls):
         mock_mail_server.SmtpServerHarness.setup_class()
         pylons_controller.PylonsTestCase.setup_class()
         tests.CreateTestData.create()
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(pylons.test.pylonsapp)
         joeadmin = model.User.get('joeadmin')
         cls.joeadmin = {'id': joeadmin.id,
                 'apikey': joeadmin.apikey,
@@ -197,7 +198,7 @@ def setup_class(cls):
         mock_mail_server.SmtpServerHarness.setup_class()
         pylons_controller.PylonsTestCase.setup_class()
         tests.CreateTestData.create()
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(pylons.test.pylonsapp)
         joeadmin = model.User.get('joeadmin')
         cls.joeadmin = {'id': joeadmin.id,
                 'apikey': joeadmin.apikey,
@@ -337,7 +338,7 @@ def setup_class(cls):
 
         wsgiapp = ckan.config.middleware.make_app(config['global_conf'],
                 **config)
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(wsgiapp)
 
         mock_mail_server.SmtpServerHarness.setup_class()
         pylons_controller.PylonsTestCase.setup_class()
@@ -421,7 +422,7 @@ def setup_class(cls):
 
         wsgiapp = ckan.config.middleware.make_app(config['global_conf'],
                 **config)
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(wsgiapp)
 
         mock_mail_server.SmtpServerHarness.setup_class()
         pylons_controller.PylonsTestCase.setup_class()
diff --git a/ckan/tests/legacy/functional/api/test_follow.py b/ckan/tests/legacy/functional/api/test_follow.py
index 98f4bd23073..909b2e77606 100644
--- a/ckan/tests/legacy/functional/api/test_follow.py
+++ b/ckan/tests/legacy/functional/api/test_follow.py
@@ -18,8 +18,6 @@
 import ckan
 from ckan.tests.legacy import are_foreign_keys_supported, SkipTest, CreateTestData, call_action_api
 
-from ckan.tests import helpers
-
 
 def datetime_from_string(s):
     '''Return a standard datetime.datetime object initialised from a string in
@@ -297,7 +295,7 @@ def setup_class(self):
             'id': ckan.model.Group.get('david').id,
             'name': ckan.model.Group.get('david').name,
             }
-        self.app = helpers._get_test_app()
+        self.app = paste.fixture.TestApp(pylons.test.pylonsapp)
 
     @classmethod
     def teardown_class(self):
@@ -806,7 +804,7 @@ def setup_class(self):
             'id': ckan.model.Group.get('david').id,
             'name': ckan.model.Group.get('david').name,
             }
-        self.app = helpers._get_test_app()
+        self.app = paste.fixture.TestApp(pylons.test.pylonsapp)
         follow_user(self.app, self.testsysadmin['id'],
                 self.testsysadmin['apikey'], self.joeadmin['id'],
                 self.joeadmin['id'], self.testsysadmin['apikey'])
@@ -1156,7 +1154,7 @@ def setup_class(self):
             'id': ckan.model.Group.get('david').id,
             'name': ckan.model.Group.get('david').name,
             }
-        self.app = helpers._get_test_app()
+        self.app = paste.fixture.TestApp(pylons.test.pylonsapp)
 
         follow_user(self.app, self.joeadmin['id'], self.joeadmin['apikey'],
                 self.testsysadmin['id'], self.testsysadmin['id'],
diff --git a/ckan/tests/legacy/functional/api/test_resource.py b/ckan/tests/legacy/functional/api/test_resource.py
index 28c3a6bed15..e8c53593bcd 100644
--- a/ckan/tests/legacy/functional/api/test_resource.py
+++ b/ckan/tests/legacy/functional/api/test_resource.py
@@ -45,7 +45,7 @@ def teardown_class(self):
     def test_good_input(self):
         offset = self.base_url + '/format_autocomplete?incomplete=cs'
         result = self.app.get(offset, status=200)
-        content_type = result.headers['Content-Type']
+        content_type = result.header_dict['Content-Type']
         assert 'application/json' in content_type, content_type
         res_json = self.loads(result.body)
         assert 'ResultSet' in res_json, res_json
@@ -58,7 +58,7 @@ def test_good_input(self):
     def test_missing_format(self):
         offset = self.base_url + '/format_autocomplete?incomplete=incorrectformat'
         result = self.app.get(offset, status=200)
-        content_type = result.headers['Content-Type']
+        content_type = result.header_dict['Content-Type']
         assert 'application/json' in content_type, content_type
         res_json = self.loads(result.body)
         assert 'ResultSet' in res_json, res_json
diff --git a/ckan/tests/legacy/functional/api/test_user.py b/ckan/tests/legacy/functional/api/test_user.py
index 3096a9f9cff..c2718fc1bdc 100644
--- a/ckan/tests/legacy/functional/api/test_user.py
+++ b/ckan/tests/legacy/functional/api/test_user.py
@@ -13,7 +13,6 @@
 from ckan.tests.legacy import url_for
 import ckan.config.middleware
 from ckan.common import json
-from ckan.tests import helpers
 
 
 class TestUserApi(ControllerTestCase):
@@ -26,12 +25,8 @@ def teardown_class(cls):
         model.repo.rebuild_db()
 
     def test_autocomplete(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='user_autocomplete', ver=2)
-
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='user_autocomplete', ver=2),
             params={
                'q': u'sysadmin',
             },
@@ -40,15 +35,11 @@ def test_autocomplete(self):
         print response.json
         assert set(response.json[0].keys()) == set(['id', 'name', 'fullname'])
         assert_equal(response.json[0]['name'], u'testsysadmin')
-        assert_equal(response.headers['Content-Type'], 'application/json;charset=utf-8')
+        assert_equal(response.header('Content-Type'), 'application/json;charset=utf-8')
 
     def test_autocomplete_multiple(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='user_autocomplete', ver=2)
-
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='user_autocomplete', ver=2),
             params={
                'q': u'tes',
             },
@@ -58,12 +49,8 @@ def test_autocomplete_multiple(self):
         assert_equal(len(response.json), 2)
 
     def test_autocomplete_limit(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='user_autocomplete', ver=2)
-
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='user_autocomplete', ver=2),
             params={
                'q': u'tes',
                'limit': 1
@@ -85,7 +72,7 @@ def setup_class(cls):
         cls._original_config = config.copy()
         wsgiapp = ckan.config.middleware.make_app(
             config['global_conf'], **config)
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(wsgiapp)
         cls.sysadmin_user = model.User.get('testsysadmin')
         PylonsTestCase.setup_class()
 
@@ -135,7 +122,7 @@ def setup_class(cls):
         config['ckan.auth.create_user_via_api'] = True
         wsgiapp = ckan.config.middleware.make_app(
             config['global_conf'], **config)
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(wsgiapp)
         PylonsTestCase.setup_class()
         cls.sysadmin_user = model.User.get('testsysadmin')
 
@@ -183,7 +170,7 @@ def setup_class(cls):
         config['ckan.auth.create_user_via_web'] = False
         wsgiapp = ckan.config.middleware.make_app(
             config['global_conf'], **config)
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(wsgiapp)
         cls.sysadmin_user = model.User.get('testsysadmin')
         PylonsTestCase.setup_class()
 
@@ -219,7 +206,7 @@ def setup_class(cls):
         config['ckan.auth.create_user_via_web'] = True
         wsgiapp = ckan.config.middleware.make_app(
             config['global_conf'], **config)
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(wsgiapp)
         cls.sysadmin_user = model.User.get('testsysadmin')
         PylonsTestCase.setup_class()
 
diff --git a/ckan/tests/legacy/functional/api/test_util.py b/ckan/tests/legacy/functional/api/test_util.py
index 9065d00e7da..9ba2adb9afe 100644
--- a/ckan/tests/legacy/functional/api/test_util.py
+++ b/ckan/tests/legacy/functional/api/test_util.py
@@ -18,12 +18,8 @@ def teardown_class(cls):
         model.repo.rebuild_db()
 
     def test_package_slug_invalid(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='is_slug_valid', ver=2)
-
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='is_slug_valid', ver=2),
             params={
                'type': u'package',
                'slug': u'edit',
@@ -31,14 +27,10 @@ def test_package_slug_invalid(self):
             status=200,
         )
         assert_equal(response.body, '{"valid": false}')
-        assert_equal(response.headers['Content-Type'], 'application/json;charset=utf-8')
-
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='is_slug_valid', ver=2)
+        assert_equal(response.header('Content-Type'), 'application/json;charset=utf-8')
 
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='is_slug_valid', ver=2),
             params={
                'type': u'package',
                'slug': u'new',
@@ -46,15 +38,11 @@ def test_package_slug_invalid(self):
             status=200,
         )
         assert_equal(response.body, '{"valid": false}')
-        assert_equal(response.headers['Content-Type'], 'application/json;charset=utf-8')
+        assert_equal(response.header('Content-Type'), 'application/json;charset=utf-8')
 
     def test_package_slug_valid(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='is_slug_valid', ver=2)
-
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='is_slug_valid', ver=2),
             params={
                'type': u'package',
                'slug': u'A New Title * With & Funny CHARacters',
@@ -62,14 +50,10 @@ def test_package_slug_valid(self):
             status=200,
         )
         assert_equal(response.body, '{"valid": true}')
-        assert_equal(response.headers['Content-Type'], 'application/json;charset=utf-8')
-
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='is_slug_valid', ver=2)
+        assert_equal(response.header('Content-Type'), 'application/json;charset=utf-8')
 
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='is_slug_valid', ver=2),
             params={
                'type': u'package',
                'slug': u'warandpeace',
@@ -77,64 +61,44 @@ def test_package_slug_valid(self):
             status=200,
         )
         assert_equal(response.body, '{"valid": false}')
-        assert_equal(response.headers['Content-Type'], 'application/json;charset=utf-8')
+        assert_equal(response.header('Content-Type'), 'application/json;charset=utf-8')
 
     def test_markdown(self):
         markdown = '''##Title'''
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='markdown', ver=2)
-
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='markdown', ver=2),
             params={'q': markdown},
             status=200,
         )
         assert_equal(response.body, '"<h2>Title</h2>"')
 
     def test_munge_package_name(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='munge_package_name', ver=2)
-
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='munge_package_name', ver=2),
             params={'name': 'test name'},
             status=200,
         )
         assert_equal(response.body, '"test-name"')
 
     def test_munge_title_to_package_name(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='munge_title_to_package_name', ver=2)
-
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='munge_title_to_package_name', ver=2),
             params={'name': 'Test title'},
             status=200,
         )
         assert_equal(response.body, '"test-title"')
 
     def test_munge_tag(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='munge_tag', ver=2)
-
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='munge_tag', ver=2),
             params={'name': 'Test subject'},
             status=200,
         )
         assert_equal(response.body, '"test-subject"')
 
     def test_status(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='api', action='status', ver=2)
-
         response = self.app.get(
-            url,
+            url=url_for(controller='api', action='status', ver=2),
             params={},
             status=200,
         )
diff --git a/ckan/tests/legacy/functional/test_activity.py b/ckan/tests/legacy/functional/test_activity.py
index 49e228a7d87..e6aa85fc843 100644
--- a/ckan/tests/legacy/functional/test_activity.py
+++ b/ckan/tests/legacy/functional/test_activity.py
@@ -14,10 +14,9 @@
 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, WsgiAppCase
+from ckan.tests.legacy import CreateTestData
 
-
-class TestActivity(WsgiAppCase, HtmlCheckMethods):
+class TestActivity(HtmlCheckMethods):
     """Test the rendering of activity streams into HTML pages.
 
     Activity streams are tested in detail elsewhere, this class just briefly
@@ -30,6 +29,7 @@ def setup(cls):
             raise SkipTest('Activity streams not enabled')
         CreateTestData.create()
         cls.sysadmin_user = ckan.model.User.get('testsysadmin')
+        cls.app = paste.fixture.TestApp(pylonsapp)
 
     @classmethod
     def teardown(cls):
@@ -52,9 +52,7 @@ def test_user_activity(self):
             'allow_partial_update': True,
             }
         user = user_create(context, user_dict)
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='user', action='activity', id=user['id'])
+        offset = url_for(controller='user', action='activity', id=user['id'])
         result = self.app.get(offset, status=200)
         stripped = self.strip_tags(result)
         assert '%s signed up' % user['fullname'] in stripped, stripped
@@ -241,9 +239,7 @@ def test_user_activity(self):
 
         # The user's dashboard page should load successfully and have the
         # latest 15 activities on it.
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='user', action='dashboard')
+        offset = url_for(controller='user', action='dashboard')
         extra_environ = {'Authorization':
                 str(ckan.model.User.get('billybeane').apikey)}
         result = self.app.post(offset, extra_environ=extra_environ,
diff --git a/ckan/tests/legacy/functional/test_admin.py b/ckan/tests/legacy/functional/test_admin.py
index 41ba685fc38..7737f036650 100644
--- a/ckan/tests/legacy/functional/test_admin.py
+++ b/ckan/tests/legacy/functional/test_admin.py
@@ -15,8 +15,7 @@ def teardown_class(self):
 
     #test that only sysadmins can access the /ckan-admin page
     def test_index(self):
-        with self.app.flask_app.test_request_context():
-            url = url_for('ckanadmin', action='index')
+        url = url_for('ckanadmin', action='index')
         response = self.app.get(url, status=[403])
         # random username
         response = self.app.get(url, status=[403],
diff --git a/ckan/tests/legacy/functional/test_group.py b/ckan/tests/legacy/functional/test_group.py
index 1e952879ad1..0223375f232 100644
--- a/ckan/tests/legacy/functional/test_group.py
+++ b/ckan/tests/legacy/functional/test_group.py
@@ -95,9 +95,7 @@ def test_sorting(self):
 
     def test_read_non_existent(self):
         name = u'group_does_not_exist'
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='group', action='read', id=name)
+        offset = url_for(controller='group', action='read', id=name)
         res = self.app.get(offset, status=404)
 
 
@@ -133,10 +131,8 @@ def teardown_class(self):
         model.repo.rebuild_db()
 
     def test_2_atom_feed(self):
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='group', action='history',
-                             id=self.grp.name)
+        offset = url_for(controller='group', action='history',
+                         id=self.grp.name)
         offset = "%s?format=atom" % offset
         res = self.app.get(offset)
         assert '<feed' in res, res
@@ -159,9 +155,7 @@ def test_member_new_invites_user_if_received_email(self, mail_user):
         group_name = 'a_group'
         CreateTestData.create_groups([{'name': group_name}], user.name)
         group = model.Group.get(group_name)
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='group', action='member_new', id=group.id)
+        url = url_for(controller='group', action='member_new', id=group.id)
         email = 'invited_user@mailinator.com'
         role = 'member'
 
diff --git a/ckan/tests/legacy/functional/test_package.py b/ckan/tests/legacy/functional/test_package.py
index 8db611e0b88..b09a0f55ef9 100644
--- a/ckan/tests/legacy/functional/test_package.py
+++ b/ckan/tests/legacy/functional/test_package.py
@@ -177,9 +177,7 @@ def _check_redirect(self, return_url_param, expected_redirect,
                 pkg_id = ''
             if return_url_param:
                 offset_params['return_to'] = return_url_param
-
-            with self.app.flask_app.test_request_context():
-                offset = url_for(**offset_params)
+            offset = url_for(**offset_params)
             res = self.app.get(offset, extra_environ=extra_environ)
             assert 'Datasets -' in res
             fv = res.forms['dataset-edit']
@@ -217,9 +215,7 @@ def teardown_class(cls):
 
     def test_read_nonexistentpackage(self):
         name = 'anonexistentpackage'
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='read', id=name)
+        offset = url_for(controller='package', action='read', id=name)
         res = self.app.get(offset, status=404)
 
     def test_read_internal_links(self):
@@ -230,9 +226,7 @@ def test_read_internal_links(self):
                    'tag:tag_1 group:test-group-1 and a multi-word tag: tag:"multi word with punctuation."',
              }
             ])
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='read', id=pkg_name)
+        offset = url_for(controller='package', action='read', id=pkg_name)
         res = self.app.get(offset)
         def check_link(res, controller, id):
             id_in_uri = id.strip('"').replace(' ', '%20') # remove quotes and percent-encode spaces
@@ -249,9 +243,7 @@ def test_read_plugin_hook(self):
         plugins.load('test_package_controller_plugin')
         plugin = plugins.get_plugin('test_package_controller_plugin')
         name = u'annakarenina'
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='read', id=name)
+        offset = url_for(controller='package', action='read', id=name)
         res = self.app.get(offset)
 
         assert plugin.calls['read'] == 1, plugin.calls
@@ -272,9 +264,7 @@ def test_resource_list(self):
         context['api_version'] = 3
         update.package_update(context, pkg)
         # check that the cache url is included on the dataset view page
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='read', id=name)
+        offset = url_for(controller='package', action='read', id=name)
         res = self.app.get(offset)
         #assert '[cached]'in res
         #assert cache_url in res
@@ -316,8 +306,7 @@ def setup_class(cls):
         pkg.extras['key2'] = u'value3'
         model.repo.commit_and_remove()
 
-        with cls.app.flask_app.test_request_context():
-            cls.offset = url_for(controller='package',
+        cls.offset = url_for(controller='package',
                              action='read',
                              id=cls.pkg_name)
         pkg = model.Package.by_name(cls.pkg_name)
@@ -425,9 +414,7 @@ def _reset_data(self):
 
         self.editpkg = model.Package.by_name(self.editpkg_name)
         self.pkgid = self.editpkg.id
-
-        with self.app.flask_app.test_request_context():
-            self.offset = url_for(controller='package', action='edit', id=self.editpkg_name)
+        self.offset = url_for(controller='package', action='edit', id=self.editpkg_name)
 
         self.editpkg = model.Package.by_name(self.editpkg_name)
         self.admin = model.User.by_name(u'testsysadmin')
@@ -503,9 +490,7 @@ def test_after_update_plugin_hook(self):
 
 
     def test_edit_404(self):
-
-        with self.app.flask_app.test_request_context():
-            self.offset = url_for(controller='package', action='edit', id='random_name')
+        self.offset = url_for(controller='package', action='edit', id='random_name')
         self.res = self.app.get(self.offset, status=404)
 
 
@@ -524,9 +509,7 @@ def test_edit_pkg_with_relationships(self):
             assert_equal(str(rels), '[<*PackageRelationship editpkgtest depends_on annakarenina>]')
 
             # edit the package
-
-            with self.app.flask_app.test_request_context():
-                self.offset = url_for(controller='package', action='edit', id=self.editpkg_name)
+            self.offset = url_for(controller='package', action='edit', id=self.editpkg_name)
             self.res = self.app.get(self.offset, extra_environ=self.extra_environ_admin)
             fv = self.res.forms['dataset-edit']
             fv['title'] = u'New Title'
@@ -564,8 +547,7 @@ def test_delete(self):
         plugins.load('test_package_controller_plugin')
         plugin = plugins.get_plugin('test_package_controller_plugin')
 
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='delete',
+        offset = url_for(controller='package', action='delete',
                 id='warandpeace')
         # Since organizations, any owned dataset can be edited/deleted by any
         # user
@@ -600,9 +582,7 @@ def teardown_class(self):
     def test_new_plugin_hook(self):
         plugins.load('test_package_controller_plugin')
         plugin = plugins.get_plugin('test_package_controller_plugin')
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='new')
+        offset = url_for(controller='package', action='new')
         res = self.app.get(offset, extra_environ=self.extra_environ_tester)
         new_name = u'plugged'
         fv = res.forms['dataset-edit']
@@ -617,9 +597,7 @@ def test_new_plugin_hook(self):
     def test_after_create_plugin_hook(self):
         plugins.load('test_package_controller_plugin')
         plugin = plugins.get_plugin('test_package_controller_plugin')
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='new')
+        offset = url_for(controller='package', action='new')
         res = self.app.get(offset, extra_environ=self.extra_environ_tester)
         new_name = u'plugged2'
         fv = res.forms['dataset-edit']
@@ -639,8 +617,8 @@ def test_new_indexerror(self):
         try:
             SolrSettings.init(bad_solr_url)
             new_package_name = u'new-package-missing-solr'
-            with self.app.flask_app.test_request_context():
-                offset = url_for(controller='package', action='new')
+
+            offset = url_for(controller='package', action='new')
             res = self.app.get(offset, extra_environ=self.extra_environ_tester)
             fv = res.forms['dataset-edit']
             fv['name'] = new_package_name
@@ -655,9 +633,7 @@ def test_new_indexerror(self):
             SolrSettings.init(solr_url)
 
     def test_change_locale(self):
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='new')
+        offset = url_for(controller='package', action='new')
         res = self.app.get(offset, extra_environ=self.extra_environ_tester)
 
         res = self.app.get('/de/dataset/new', extra_environ=self.extra_environ_tester)
@@ -707,16 +683,12 @@ def teardown_class(self):
         model.repo.rebuild_db()
 
     def test_read(self):
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='read', id=self.non_active_name)
+        offset = url_for(controller='package', action='read', id=self.non_active_name)
         res = self.app.get(offset, status=[404])
 
 
     def test_read_as_admin(self):
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='read', id=self.non_active_name)
+        offset = url_for(controller='package', action='read', id=self.non_active_name)
         res = self.app.get(offset, status=200, extra_environ={'REMOTE_USER':'testsysadmin'})
 
 
@@ -746,9 +718,7 @@ def setup_class(cls):
         cls.revision_ids = [rev[0].id for rev in cls.pkg1.all_related_revisions]
                            # revision ids are newest first
         cls.revision_timestamps = [rev[0].timestamp for rev in cls.pkg1.all_related_revisions]
-
-        with cls.app.flask_app.test_request_context():
-            cls.offset = url_for(controller='package', action='history', id=cls.pkg1.name)
+        cls.offset = url_for(controller='package', action='history', id=cls.pkg1.name)
 
     @classmethod
     def teardown_class(cls):
diff --git a/ckan/tests/legacy/functional/test_pagination.py b/ckan/tests/legacy/functional/test_pagination.py
index 3a4fc7912c7..596bc5fa453 100644
--- a/ckan/tests/legacy/functional/test_pagination.py
+++ b/ckan/tests/legacy/functional/test_pagination.py
@@ -59,41 +59,25 @@ def teardown_class(self):
         model.repo.rebuild_db()
 
     def test_package_search_p1(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='package', action='search', q='groups:group_00')
-
-        res = self.app.get(url)
+        res = self.app.get(url_for(controller='package', action='search', q='groups:group_00'))
         assert 'href="/dataset?q=groups%3Agroup_00&amp;page=2"' in res
         pkg_numbers = scrape_search_results(res, 'dataset')
         assert_equal(['50', '49', '48', '47', '46', '45', '44', '43', '42', '41', '40', '39', '38', '37', '36', '35', '34', '33', '32', '31'], pkg_numbers)
 
     def test_package_search_p2(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='package', action='search', q='groups:group_00', page=2)
-
-        res = self.app.get(url)
+        res = self.app.get(url_for(controller='package', action='search', q='groups:group_00', page=2))
         assert 'href="/dataset?q=groups%3Agroup_00&amp;page=1"' in res
         pkg_numbers = scrape_search_results(res, 'dataset')
         assert_equal(['30', '29', '28', '27', '26', '25', '24', '23', '22', '21', '20', '19', '18', '17', '16', '15', '14', '13', '12', '11'], pkg_numbers)
 
     def test_group_datasets_read_p1(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='group', action='read', id='group_00')
-
-        res = self.app.get(url)
+        res = self.app.get(url_for(controller='group', action='read', id='group_00'))
         assert 'href="/group/group_00?page=2' in res, res
         pkg_numbers = scrape_search_results(res, 'group_dataset')
         assert_equal(['50', '49', '48', '47', '46', '45', '44', '43', '42', '41', '40', '39', '38', '37', '36', '35', '34', '33', '32', '31'], pkg_numbers)
 
     def test_group_datasets_read_p2(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='group', action='read', id='group_00', page=2)
-
-        res = self.app.get(url)
+        res = self.app.get(url_for(controller='group', action='read', id='group_00', page=2))
         assert 'href="/group/group_00?page=1' in res, res
         pkg_numbers = scrape_search_results(res, 'group_dataset')
         assert_equal(['30', '29', '28', '27', '26', '25', '24', '23', '22', '21', '20', '19', '18', '17', '16', '15', '14', '13', '12', '11'], pkg_numbers)
@@ -117,20 +101,12 @@ def teardown_class(self):
         model.repo.rebuild_db()
 
     def test_group_index(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='group', action='index')
-
-        res = self.app.get(url)
+        res = self.app.get(url_for(controller='group', action='index'))
         assert 'href="/group?q=&amp;sort=&amp;page=2"' in res, res
         grp_numbers = scrape_search_results(res, 'group')
         assert_equal(['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20'], grp_numbers)
 
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='group', action='index', page=2)
-
-        res = self.app.get(url)
+        res = self.app.get(url_for(controller='group', action='index', page=2))
         assert 'href="/group?q=&amp;sort=&amp;page=1"' in res
         grp_numbers = scrape_search_results(res, 'group')
         assert_equal(['21'], grp_numbers)
@@ -154,19 +130,12 @@ def teardown_class(self):
         model.repo.rebuild_db()
 
     def test_users_index(self):
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='user', action='index')
-
-        res = self.app.get(url)
+        res = self.app.get(url_for(controller='user', action='index'))
         assert 'href="/user?q=&amp;order_by=name&amp;page=2"' in res
         user_numbers = scrape_search_results(res, 'user')
         assert_equal(['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19'], user_numbers)
 
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='user', action='index', page=2)
-
-        res = self.app.get(url)
+        res = self.app.get(url_for(controller='user', action='index', page=2))
         assert 'href="/user?q=&amp;order_by=name&amp;page=1"' in res
         user_numbers = scrape_search_results(res, 'user')
         assert_equal(['20'], user_numbers)
diff --git a/ckan/tests/legacy/functional/test_preview_interface.py b/ckan/tests/legacy/functional/test_preview_interface.py
index 747834446e3..deb7aa6f965 100644
--- a/ckan/tests/legacy/functional/test_preview_interface.py
+++ b/ckan/tests/legacy/functional/test_preview_interface.py
@@ -19,16 +19,14 @@ def setup_class(cls):
 
         cls.package = model.Package.get('annakarenina')
         cls.resource = cls.package.resources[0]
-
-        with cls.app.flask_app.test_request_context():
-            cls.url = h.url_for(controller='package',
-                action='resource_read',
-                id=cls.package.name,
-                resource_id=cls.resource.id)
-            cls.preview_url = h.url_for(controller='package',
-                action='resource_datapreview',
-                id=cls.package.id,
-                resource_id=cls.resource.id)
+        cls.url = h.url_for(controller='package',
+            action='resource_read',
+            id=cls.package.name,
+            resource_id=cls.resource.id)
+        cls.preview_url = h.url_for(controller='package',
+            action='resource_datapreview',
+            id=cls.package.id,
+            resource_id=cls.resource.id)
 
     @classmethod
     def teardown_class(cls):
@@ -37,9 +35,7 @@ def teardown_class(cls):
 
     def test_hook(self):
         testpackage = self.package
-
-        with self.app.flask_app.test_request_context():
-            resource_dict = model_dictize.resource_dictize(self.resource, {'model': model})
+        resource_dict = model_dictize.resource_dictize(self.resource, {'model': model})
 
         context = {
             'model': model,
@@ -74,12 +70,10 @@ def test_hook(self):
         assert self.plugin.calls['preview_templates'] == 1, self.plugin.calls
 
         # test whether the json preview is used
-
-        with self.app.flask_app.test_request_context():
-            preview_url = h.url_for(controller='package',
-                    action='resource_datapreview',
-                    id=testpackage.id,
-                    resource_id=testpackage.resources[1].id)
+        preview_url = h.url_for(controller='package',
+                action='resource_datapreview',
+                id=testpackage.id,
+                resource_id=testpackage.resources[1].id)
         result = self.app.get(preview_url, status=200)
 
         assert 'mock-json-preview' in result.body
diff --git a/ckan/tests/legacy/functional/test_revision.py b/ckan/tests/legacy/functional/test_revision.py
index 5312aad7c29..af0f653fa1c 100644
--- a/ckan/tests/legacy/functional/test_revision.py
+++ b/ckan/tests/legacy/functional/test_revision.py
@@ -90,9 +90,7 @@ def get_package(self, name):
     def test_read(self):
         anna = model.Package.by_name(u'annakarenina')
         rev_id = anna.revision.id
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='revision', action='read', id='%s' % rev_id)
+        offset = url_for(controller='revision', action='read', id='%s' % rev_id)
         res = self.app.get(offset)
         assert 'Revision %s' % rev_id in res
         assert 'Revision: %s' % rev_id in res
@@ -134,18 +132,14 @@ def test_list_format_atom(self):
         # Todo: Test for first revision on last page.
         # Todo: Test for last revision minus 50 on second page.
         # Page 1.   (Implied id=1)
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='revision', action='list', format='atom')
+        offset = url_for(controller='revision', action='list', format='atom')
         res = self.app.get(offset)
         assert '<feed' in res, res
         assert 'xmlns="http://www.w3.org/2005/Atom"' in res, res
         assert '</feed>' in res, res
         # Todo: Better test for 'days' request param.
         #  - fake some older revisions and check they aren't included.
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='revision', action='list', format='atom',
+        offset = url_for(controller='revision', action='list', format='atom',
                 days=30)
         res = self.app.get(offset)
         assert '<feed' in res, res
diff --git a/ckan/tests/legacy/functional/test_tag.py b/ckan/tests/legacy/functional/test_tag.py
index 7a0f5131a36..8cd5c346a26 100644
--- a/ckan/tests/legacy/functional/test_tag.py
+++ b/ckan/tests/legacy/functional/test_tag.py
@@ -7,7 +7,6 @@
 
 HTTP_MOVED_PERMANENTLY = 301
 
-
 class TestTagController(TestController):
 
     @classmethod
@@ -22,20 +21,14 @@ def teardown_class(self):
     def test_autocomplete(self):
         controller = 'api'
         action = 'tag_autocomplete'
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller=controller, action=action, ver=2)
+        offset = url_for(controller=controller, action=action, ver=2)
         res = self.app.get(offset)
         assert '[]' in res
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller=controller, action=action, incomplete='russian', ver=2)
+        offset = url_for(controller=controller, action=action, incomplete='russian', ver=2)
         res = self.app.get(offset)
         assert 'russian' in res
         assert 'tolstoy' not in res
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller=controller, action=action, incomplete='tolstoy', ver=2)
+        offset = url_for(controller=controller, action=action, incomplete='tolstoy', ver=2)
         res = self.app.get(offset)
         assert 'russian' not in res
         assert 'tolstoy' in res
@@ -43,9 +36,7 @@ def test_autocomplete(self):
     def test_autocomplete_with_capital_letter_in_search_term(self):
         controller = 'api'
         action = 'tag_autocomplete'
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller=controller, action=action, incomplete='Flex', ver=2)
+        offset = url_for(controller=controller, action=action, incomplete='Flex', ver=2)
         res = self.app.get(offset)
         data = json.loads(res.body)
         assert u'Flexible \u30a1' in data['ResultSet']['Result'][0].values()
@@ -53,9 +44,7 @@ def test_autocomplete_with_capital_letter_in_search_term(self):
     def test_autocomplete_with_space_in_search_term(self):
         controller = 'api'
         action = 'tag_autocomplete'
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller=controller, action=action, incomplete='Flexible ', ver=2)
+        offset = url_for(controller=controller, action=action, incomplete='Flexible ', ver=2)
         res = self.app.get(offset)
         data = json.loads(res.body)
         assert u'Flexible \u30a1' in data['ResultSet']['Result'][0].values()
@@ -63,9 +52,7 @@ def test_autocomplete_with_space_in_search_term(self):
     def test_autocomplete_with_unicode_in_search_term(self):
         controller = 'api'
         action = 'tag_autocomplete'
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller=controller, action=action, incomplete=u'ible \u30a1', ver=2)
+        offset = url_for(controller=controller, action=action, incomplete=u'ible \u30a1', ver=2)
         res = self.app.get(offset)
         data = json.loads(res.body)
         assert u'Flexible \u30a1' in data['ResultSet']['Result'][0].values()
diff --git a/ckan/tests/legacy/functional/test_tracking.py b/ckan/tests/legacy/functional/test_tracking.py
index cac500b7ac1..49ffad338b7 100644
--- a/ckan/tests/legacy/functional/test_tracking.py
+++ b/ckan/tests/legacy/functional/test_tracking.py
@@ -5,9 +5,9 @@
 import tempfile
 import csv
 import datetime
+
 from ckan.lib.helpers import url_for
 import ckan.tests.legacy as tests
-from ckan.tests import helpers
 
 
 class TestTracking(object):
@@ -17,7 +17,9 @@ def tearDown(self):
         model.repo.rebuild_db()
 
     def _get_app(self):
-        return helpers._get_test_app()
+        import paste.fixture
+        import pylons.test
+        return paste.fixture.TestApp(pylons.test.pylonsapp)
 
     def _create_sysadmin(self, app):
         '''Create a sysadmin user.
@@ -154,9 +156,7 @@ def test_package_with_one_view(self):
         package = self._create_package(app, apikey)
         self._create_resource(app, package, apikey)
 
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id=package['name'])
         self._post_to_tracking(app, url)
 
@@ -189,9 +189,7 @@ def test_resource_with_one_preview(self):
         package = self._create_package(app, apikey)
         resource = self._create_resource(app, package, apikey)
 
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='resource_read',
+        url = url_for(controller='package', action='resource_read',
                              id=package['name'], resource_id=resource['id'])
         self._post_to_tracking(app, url)
 
@@ -298,9 +296,7 @@ def test_package_with_many_views(self):
         package = self._create_package(app, apikey)
         self._create_resource(app, package, apikey)
 
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id=package['name'])
 
         # View the package three times from different IPs.
@@ -414,9 +410,7 @@ def test_dataset_view_count_throttling(self):
         sysadmin_user, apikey = self._create_sysadmin(app)
         package = self._create_package(app, apikey)
         self._create_resource(app, package, apikey)
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id=package['name'])
 
         # Visit the dataset three times from the same IP.
@@ -474,22 +468,16 @@ def test_sorting_datasets_by_recent_views(self):
         self._create_package(app, apikey, name='the_player_of_games')
         self._create_package(app, apikey, name='use_of_weapons')
 
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id='consider_phlebas')
         self._post_to_tracking(app, url)
 
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id='the_player_of_games')
         self._post_to_tracking(app, url, ip='111.11.111.111')
         self._post_to_tracking(app, url, ip='222.22.222.222')
 
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id='use_of_weapons')
         self._post_to_tracking(app, url, ip='111.11.111.111')
         self._post_to_tracking(app, url, ip='222.22.222.222')
@@ -520,22 +508,16 @@ def test_sorting_datasets_by_total_views(self):
         self._create_package(app, apikey, name='the_player_of_games')
         self._create_package(app, apikey, name='use_of_weapons')
 
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id='consider_phlebas')
         self._post_to_tracking(app, url)
 
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id='the_player_of_games')
         self._post_to_tracking(app, url, ip='111.11.111.111')
         self._post_to_tracking(app, url, ip='222.22.222.222')
 
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id='use_of_weapons')
         self._post_to_tracking(app, url, ip='111.11.111.111')
         self._post_to_tracking(app, url, ip='222.22.222.222')
@@ -628,18 +610,14 @@ def test_export(self):
         package_2 = self._create_package(app, apikey, name='another_package')
 
         # View the package_1 three times from different IPs.
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id=package_1['name'])
         self._post_to_tracking(app, url, ip='111.222.333.44')
         self._post_to_tracking(app, url, ip='111.222.333.55')
         self._post_to_tracking(app, url, ip='111.222.333.66')
 
         # View the package_2 twice from different IPs.
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
+        url = url_for(controller='package', action='read',
                              id=package_2['name'])
         self._post_to_tracking(app, url, ip='111.222.333.44')
         self._post_to_tracking(app, url, ip='111.222.333.55')
diff --git a/ckan/tests/legacy/functional/test_user.py b/ckan/tests/legacy/functional/test_user.py
index 49a5e143e22..472b36995bb 100644
--- a/ckan/tests/legacy/functional/test_user.py
+++ b/ckan/tests/legacy/functional/test_user.py
@@ -42,11 +42,7 @@ def setup_class(cls):
     @classmethod
     def teardown_class(self):
         # clear routes 'id' so that next test to run doesn't get it
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='user', action='login', id=None)
-
-        self.app.get(url)
+        self.app.get(url_for(controller='user', action='login', id=None))
         SmtpServerHarness.teardown_class()
         model.repo.rebuild_db()
 
@@ -56,24 +52,19 @@ def teardown(self):
 
     def test_user_delete_redirects_to_user_index(self):
         user = CreateTestData.create_user('a_user')
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='user', action='delete', id=user.id)
-            redirect_url = url_for(controller='user', action='index',
-                                   qualified=True)
-
+        url = url_for(controller='user', action='delete', id=user.id)
         extra_environ = {'REMOTE_USER': 'testsysadmin'}
 
+        redirect_url = url_for(controller='user', action='index',
+                qualified=True)
         res = self.app.get(url, status=302, extra_environ=extra_environ)
 
         assert user.is_deleted(), user
-        assert res.headers['Location'].startswith(redirect_url), res.headers['Location']
+        assert res.header('Location').startswith(redirect_url), res.header('Location')
 
     def test_user_delete_by_unauthorized_user(self):
         user = model.User.by_name(u'annafan')
-
-        with self.app.flask_app.test_request_context():
-            url = url_for(controller='user', action='delete', id=user.id)
+        url = url_for(controller='user', action='delete', id=user.id)
         extra_environ = {'REMOTE_USER': 'an_unauthorized_user'}
 
         self.app.get(url, status=403, extra_environ=extra_environ)
@@ -104,15 +95,11 @@ def test_apikey(self):
             model.Session.remove()
 
         # not logged in
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='user', action='read', id=username)
+        offset = url_for(controller='user', action='read', id=username)
         res = self.app.get(offset)
         assert not 'API key' in res
 
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='user', action='read', id='okfntest')
+        offset = url_for(controller='user', action='read', id='okfntest')
         res = self.app.get(offset, extra_environ={'REMOTE_USER': 'okfntest'})
         assert user.apikey in res, res
 
@@ -120,9 +107,7 @@ def test_perform_reset_user_password_link_key_incorrect(self):
         CreateTestData.create_user(name='jack', password='TestPassword1')
         # Make up a key - i.e. trying to hack this
         user = model.User.by_name(u'jack')
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='user',
+        offset = url_for(controller='user',
                          action='perform_reset',
                          id=user.id,
                          key='randomness') # i.e. incorrect
@@ -131,9 +116,7 @@ def test_perform_reset_user_password_link_key_incorrect(self):
     def test_perform_reset_user_password_link_key_missing(self):
         CreateTestData.create_user(name='jack', password='TestPassword1')
         user = model.User.by_name(u'jack')
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='user',
+        offset = url_for(controller='user',
                          action='perform_reset',
                          id=user.id)  # not, no key specified
         res = self.app.get(offset, status=403) # error
@@ -142,9 +125,7 @@ def test_perform_reset_user_password_link_key_missing(self):
     def test_perform_reset_user_password_link_user_incorrect(self):
         # Make up a key - i.e. trying to hack this
         user = model.User.by_name(u'jack')
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='user',
+        offset = url_for(controller='user',
                          action='perform_reset',
                          id='randomness',  # i.e. incorrect
                          key='randomness')
@@ -159,9 +140,7 @@ def test_perform_reset_activates_pending_user(self):
         create_reset_key(user)
         assert user.is_pending(), user.state
 
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='user',
+        offset = url_for(controller='user',
                          action='perform_reset',
                          id=user.id,
                          key=user.reset_key)
@@ -179,9 +158,7 @@ def test_perform_reset_doesnt_activate_deleted_user(self):
         create_reset_key(user)
         assert user.is_deleted(), user.state
 
-
-        with self.app.flask_app.test_request_context():
-            offset = url_for(controller='user',
+        offset = url_for(controller='user',
                          action='perform_reset',
                          id=user.id,
                          key=user.reset_key)
diff --git a/ckan/tests/legacy/html_check.py b/ckan/tests/legacy/html_check.py
index 29b51eb2560..5b549942ee6 100644
--- a/ckan/tests/legacy/html_check.py
+++ b/ckan/tests/legacy/html_check.py
@@ -4,13 +4,12 @@
 import sgmllib
 
 import paste.fixture
-import webtest
 
 
 class HtmlCheckMethods(object):
     '''A collection of methods to check properties of a html page, usually
     in the form returned by paster.'''
-
+    
     def named_div(self, div_name, html):
         'strips html to just the <div id="DIV_NAME"> section'
         the_html = self._get_html_from_res(html)
@@ -34,13 +33,13 @@ def strip_tags(self, res):
         '''Call strip_tags on a TestResponse object to strip any and all HTML and normalise whitespace.'''
         if not isinstance(res, basestring):
             res = res.body.decode('utf-8')
-        return Stripper().strip(res)
+        return Stripper().strip(res)    
 
     def check_named_element(self, html, tag_name, *html_to_find):
         '''Searches in the html and returns True if it can find a particular
         tag and all its subtags & data which contains all the of the
         html_to_find'''
-        named_element_re = re.compile('(<(%(tag)s\w*).*?(>.*?</%(tag)s)?>)' % {'tag':tag_name})
+        named_element_re = re.compile('(<(%(tag)s\w*).*?(>.*?</%(tag)s)?>)' % {'tag':tag_name}) 
         html_str = self._get_html_from_res(html)
         self._check_html(named_element_re, html_str.replace('\n', ''), html_to_find)
 
@@ -61,14 +60,13 @@ def check_tag(self, html, *html_to_find):
         self._check_html(self.tag_re, html, html_to_find)
 
     def _get_html_from_res(self, html):
-        if isinstance(html, (paste.fixture.TestResponse, webtest.app.TestResponse)):
+        if isinstance(html, paste.fixture.TestResponse):
             html_str = html.body.decode('utf8')
         elif isinstance(html, unicode):
             html_str = html
         elif isinstance(html, str):
             html_str = html.decode('utf8')
         else:
-            import ipdb; ipdb.set_trace()
             raise TypeError
         return html_str # always unicode
 
diff --git a/ckan/tests/legacy/lib/test_alphabet_pagination.py b/ckan/tests/legacy/lib/test_alphabet_pagination.py
index c3f4cdaa428..97d2773c634 100644
--- a/ckan/tests/legacy/lib/test_alphabet_pagination.py
+++ b/ckan/tests/legacy/lib/test_alphabet_pagination.py
@@ -8,7 +8,6 @@
 from ckan.tests.legacy import regex_related
 from ckan.lib.create_test_data import CreateTestData
 from ckan import model
-from ckan.tests import helpers
 
 other = 'Other'
 
@@ -55,9 +54,7 @@ def test_01_package_page(self):
             page='A',
             other_text=other,
         )
-        app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            pager = page.pager()
+        pager = page.pager()
         assert_true(
             pager.startswith(
                 '<div class="pagination pagination-alphabet">'
diff --git a/ckan/tests/legacy/logic/test_action.py b/ckan/tests/legacy/logic/test_action.py
index 0684c957ae5..4c68d745f8b 100644
--- a/ckan/tests/legacy/logic/test_action.py
+++ b/ckan/tests/legacy/logic/test_action.py
@@ -25,8 +25,6 @@
 from ckan.tests.legacy import call_action_api
 import ckan.lib.search as search
 
-from ckan.tests import helpers
-
 from ckan import plugins
 from ckan.plugins import SingletonPlugin, implements, IPackageController
 
@@ -776,10 +774,13 @@ def test_42_resource_search_accessible_via_get_request(self):
             assert "json" in resource['format'].lower()
 
     def test_package_create_duplicate_extras_error(self):
+        import paste.fixture
+        import pylons.test
 
         # Posting a dataset dict to package_create containing two extras dicts
         # with the same key, should return a Validation Error.
-        error = call_action_api(self.app, 'package_create',
+        app = paste.fixture.TestApp(pylons.test.pylonsapp)
+        error = call_action_api(app, 'package_create',
                 apikey=self.sysadmin_user.apikey, status=409,
                 name='foobar', extras=[{'key': 'foo', 'value': 'bar'},
                     {'key': 'foo', 'value': 'gar'}])
@@ -787,29 +788,35 @@ def test_package_create_duplicate_extras_error(self):
         assert error['extras_validation'] == ['Duplicate key "foo"']
 
     def test_package_update_remove_org_error(self):
+        import paste.fixture
+        import pylons.test
 
-        org = call_action_api(self.app, 'organization_create',
+        app = paste.fixture.TestApp(pylons.test.pylonsapp)
+        org = call_action_api(app, 'organization_create',
                 apikey=self.sysadmin_user.apikey, name='myorganization')
-        package = call_action_api(self.app, 'package_create',
+        package = call_action_api(app, 'package_create',
                 apikey=self.sysadmin_user.apikey, name='foobarbaz', owner_org=org['id'])
 
         assert package['owner_org']
         package['owner_org'] = ''
-        res = call_action_api(self.app, 'package_update',
+        res = call_action_api(app, 'package_update',
                 apikey=self.sysadmin_user.apikey, **package)
         assert not res['owner_org'], res['owner_org']
 
     def test_package_update_duplicate_extras_error(self):
+        import paste.fixture
+        import pylons.test
 
         # We need to create a package first, so that we can update it.
-        package = call_action_api(self.app, 'package_create',
+        app = paste.fixture.TestApp(pylons.test.pylonsapp)
+        package = call_action_api(app, 'package_create',
                 apikey=self.sysadmin_user.apikey, name='foobar')
 
         # Posting a dataset dict to package_update containing two extras dicts
         # with the same key, should return a Validation Error.
         package['extras'] = [{'key': 'foo', 'value': 'bar'},
                     {'key': 'foo', 'value': 'gar'}]
-        error = call_action_api(self.app, 'package_update',
+        error = call_action_api(app, 'package_update',
                 apikey=self.sysadmin_user.apikey, status=409, **package)
         assert error['__type'] == 'Validation Error'
         assert error['extras_validation'] == ['Duplicate key "foo"']
diff --git a/ckan/tests/legacy/logic/test_auth.py b/ckan/tests/legacy/logic/test_auth.py
index 8c2366f972e..cd7aeafb468 100644
--- a/ckan/tests/legacy/logic/test_auth.py
+++ b/ckan/tests/legacy/logic/test_auth.py
@@ -8,7 +8,6 @@
 import ckan.model as model
 import ckan.authz as authz
 from ckan.lib.create_test_data import CreateTestData
-from ckan.tests import helpers
 import json
 
 
@@ -36,7 +35,7 @@ def setup_class(cls):
 
         wsgiapp = ckan.config.middleware.make_app(
             config['global_conf'], **config)
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(wsgiapp)
 
     @classmethod
     def teardown_class(cls):
@@ -52,7 +51,7 @@ def _call_api(cls, action, data, user, status=None):
                             params=params,
                             extra_environ={'Authorization': cls.apikeys[user]},
                             status=[200, 403, 409])
-        if res.status_int != (status or 200):
+        if res.status != (status or 200):
             error = json.loads(res.body)['error']
             raise AssertionError('Status was %s but should be %s. Error: %s' %
                                  (res.status, status, error))
@@ -258,7 +257,7 @@ def setup_class(cls):
 
         wsgiapp = ckan.config.middleware.make_app(
             config['global_conf'], **config)
-        cls.app = helpers._get_test_app()
+        cls.app = paste.fixture.TestApp(wsgiapp)
 
         CreateTestData.create_arbitrary(
             package_dicts= [{'name': 'adataset',
diff --git a/ckan/tests/legacy/misc/test_format_text.py b/ckan/tests/legacy/misc/test_format_text.py
index 7ac45c9d174..144eb270a7c 100644
--- a/ckan/tests/legacy/misc/test_format_text.py
+++ b/ckan/tests/legacy/misc/test_format_text.py
@@ -1,17 +1,8 @@
 # encoding: utf-8
 
 import ckan.lib.helpers as h
-from ckan.tests import helpers
 
-
-class TestFormatText(object):
-
-    @classmethod
-    def setup_class(cls):
-
-        # h.render_markdown calls url_for internally, so we need to have
-        # an app to provide a request context
-        cls.app = helpers._get_test_app()
+class TestFormatText:
 
     def test_markdown(self):
         instr = '''# Hello World
@@ -23,169 +14,129 @@ def test_markdown(self):
         exp = '''<h1>Hello World</h1>
 <p><strong>Some bolded text.</strong></p>
 <p><em>Some italicized text.</em></p>'''
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert out == exp, out
 
     def test_markdown_blank(self):
         instr = None
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert out == ''
 
     def test_evil_markdown(self):
         instr = 'Evil <script src="http://evilserver.net/evil.js";>'
         exp = '''<p>Evil </p>'''
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert out == exp, out
 
     def test_internal_link(self):
         instr = 'dataset:test-_pkg'
         exp = '<p><a href="/dataset/test-_pkg">dataset:test-_pkg</a></p>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_internal_tag_link(self):
         """Asserts links like 'tag:test-tag' work"""
         instr = 'tag:test-tag foobar'
         exp = '<a href="/tag/test-tag">tag:test-tag</a> foobar'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_internal_tag_linked_with_quotes(self):
         """Asserts links like 'tag:"test-tag"' work"""
         instr = 'tag:"test-tag" foobar'
         exp = '<p><a href="/tag/test-tag">tag:&#34;test-tag&#34;</a> foobar</p>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_internal_tag_linked_with_quotes_and_space(self):
         """Asserts links like 'tag:"test tag"' work"""
         instr = 'tag:"test tag" foobar'
         exp = '<p><a href="/tag/test%20tag">tag:&#34;test tag&#34;</a> foobar</p>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_internal_tag_with_no_opening_quote_only_matches_single_word(self):
         """Asserts that without an opening quote only one word is matched"""
         instr = 'tag:test tag" foobar'  # should match 'tag:test'
         exp = '<a href="/tag/test">tag:test</a> tag" foobar'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_internal_tag_with_no_opening_quote_wont_match_the_closing_quote(self):
         """Asserts that 'tag:test" tag' is matched, but to 'tag:test'"""
         instr = 'tag:test" foobar'  # should match 'tag:test'
         exp = '<a href="/tag/test">tag:test</a>" foobar'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_internal_tag_with_no_closing_quote_does_not_match(self):
         """Asserts that without an opening quote only one word is matched"""
         instr = 'tag:"test tag foobar'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert "<a href" not in out
 
     def test_tag_names_match_simple_punctuation(self):
         """Asserts punctuation and capital letters are matched in the tag name"""
         instr = 'tag:"Test- _." foobar'
         exp = '<p><a href="/tag/Test-%20_.">tag:&#34;Test- _.&#34;</a> foobar</p>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_tag_names_do_not_match_commas(self):
         """Asserts commas don't get matched as part of a tag name"""
         instr = 'tag:Test,tag foobar'
         exp = '<a href="/tag/Test">tag:Test</a>,tag foobar'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_tag_names_dont_match_non_space_whitespace(self):
         """Asserts that the only piece of whitespace matched in a tagname is a space"""
         whitespace_characters = '\t\n\r\f\v'
-
-        with self.app.flask_app.test_request_context():
-            for ch in whitespace_characters:
-                instr = 'tag:Bad' + ch + 'space'
-                exp = '<a href="/tag/Bad">tag:Bad</a>'
-                out = h.render_markdown(instr)
-                assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
+        for ch in whitespace_characters:
+            instr = 'tag:Bad' + ch + 'space'
+            exp = '<a href="/tag/Bad">tag:Bad</a>'
+            out = h.render_markdown(instr)
+            assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_tag_names_with_unicode_alphanumeric(self):
         """Asserts that unicode alphanumeric characters are captured"""
         instr = u'tag:"Japanese katakana \u30a1" blah'
         exp = u'<p><a href="/tag/Japanese%20katakana%20%E3%82%A1">tag:&#34;Japanese katakana \u30a1&#34;</a> blah</p>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, u'\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_normal_link(self):
         instr = 'http://somelink/'
         exp = '<a href="http://somelink/" target="_blank" rel="nofollow">http://somelink/</a>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
         instr = 'http://somelink.com/#anchor'
         exp = '<a href="http://somelink.com/#anchor" target="_blank" rel="nofollow">http://somelink.com/#anchor</a>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
         instr = 'http://www.somelink.com/#anchor'
         exp = '<a href="http://www.somelink.com/#anchor" target="_blank" rel="nofollow">http://www.somelink.com/#anchor</a>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_auto_link(self):
         instr = 'http://somelink.com'
         exp = '<a href="http://somelink.com" target="_blank" rel="nofollow">http://somelink.com</a>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_auto_link_after_whitespace(self):
         instr = 'go to http://somelink.com'
         exp = 'go to <a href="http://somelink.com" target="_blank" rel="nofollow">http://somelink.com</a>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_malformed_link_1(self):
         instr = u'<a href=\u201dsomelink\u201d>somelink</a>'
         exp = '<p>somelink</p>'
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
 
     def test_multiline_links(self):
@@ -197,7 +148,5 @@ def test_multiline_links(self):
   [msn]:    http://search.msn.com/    "MSN Search"'''
         exp = '''<p>I get 10 times more traffic from <a href="http://google.com/" title="Google">Google</a> than from
 <a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p>'''
-
-        with self.app.flask_app.test_request_context():
-            out = h.render_markdown(instr)
+        out = h.render_markdown(instr)
         assert exp in out, '\nGot: %s\nWanted: %s' % (out, exp)
diff --git a/ckan/tests/legacy/models/test_package.py b/ckan/tests/legacy/models/test_package.py
index 8463bbb2014..582c709beb5 100644
--- a/ckan/tests/legacy/models/test_package.py
+++ b/ckan/tests/legacy/models/test_package.py
@@ -3,7 +3,6 @@
 from nose.tools import assert_equal
 
 from ckan.tests.legacy import *
-from ckan.tests import helpers
 import ckan.model as model
 
 # Todo: More domain logic tests e.g. for isopen() and other domain logic.
@@ -100,12 +99,8 @@ def test_package_license(self):
         model.Session.remove() # forget change
 
     def test_as_dict(self):
-        # Internally as_dict calls url_for so we need an application context
-        app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-
-            pkg = model.Package.by_name(self.name)
-            out = pkg.as_dict()
+        pkg = model.Package.by_name(self.name)
+        out = pkg.as_dict()
         assert out['name'] == pkg.name
         assert out['license'] == pkg.license.title
         assert out['license_id'] == pkg.license.id
diff --git a/ckan/tests/legacy/test_coding_standards.py b/ckan/tests/legacy/test_coding_standards.py
index a7ebe30b646..5bd74bf6430 100644
--- a/ckan/tests/legacy/test_coding_standards.py
+++ b/ckan/tests/legacy/test_coding_standards.py
@@ -553,7 +553,6 @@ class TestPep8(object):
         'ckan/tests/legacy/functional/test_search.py',
         'ckan/tests/legacy/functional/test_tag.py',
         'ckan/tests/legacy/functional/test_tag_vocab.py',
-        'ckan/tests/legacy/functional/test_tracking.py',
         'ckan/tests/legacy/functional/test_upload.py',
         'ckan/tests/legacy/functional/test_user.py',
         'ckan/tests/legacy/html_check.py',
@@ -578,6 +577,7 @@ class TestPep8(object):
         '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_plugin.py',

From 282092d2c6be89131e59afb2b296bdddaaf6b9bd Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Wed, 23 Aug 2017 12:19:51 +0100
Subject: [PATCH 3/5] Revert "[#3196] Fix ckan/ tests (no legacy) depending on
 url_for"

This reverts commit 43767c78390f389b62767f7e38cfdba7d68a958b.
---
 ckan/lib/alphabet_paginate.py               |   2 +-
 ckan/tests/config/test_middleware.py        |   5 +-
 ckan/tests/controllers/test_admin.py        |  36 +-
 ckan/tests/controllers/test_api.py          | 101 ++--
 ckan/tests/controllers/test_feed.py         |  40 +-
 ckan/tests/controllers/test_group.py        | 256 +++-----
 ckan/tests/controllers/test_home.py         |  49 +-
 ckan/tests/controllers/test_organization.py | 247 +++-----
 ckan/tests/controllers/test_package.py      | 638 +++++++-------------
 ckan/tests/controllers/test_tags.py         |  20 +-
 ckan/tests/controllers/test_user.py         | 170 ++----
 ckan/tests/controllers/test_util.py         |  28 +-
 ckan/tests/lib/test_helpers.py              |   1 +
 ckan/tests/lib/test_mailer.py               |  39 +-
 ckan/tests/logic/action/test_create.py      |   6 +-
 15 files changed, 550 insertions(+), 1088 deletions(-)

diff --git a/ckan/lib/alphabet_paginate.py b/ckan/lib/alphabet_paginate.py
index 99e570af055..0fdf8d60cf8 100644
--- a/ckan/lib/alphabet_paginate.py
+++ b/ckan/lib/alphabet_paginate.py
@@ -21,7 +21,7 @@
 from sqlalchemy import  __version__ as sqav
 from sqlalchemy.orm.query import Query
 from webhelpers.html.builder import HTML
-from ckan.lib.helpers import url_for
+from routes import url_for
 
 
 class AlphaPage(object):
diff --git a/ckan/tests/config/test_middleware.py b/ckan/tests/config/test_middleware.py
index e7665877cb0..2e512438cc3 100644
--- a/ckan/tests/config/test_middleware.py
+++ b/ckan/tests/config/test_middleware.py
@@ -3,6 +3,7 @@
 import mock
 import wsgiref
 from nose.tools import assert_equals, assert_not_equals, eq_, assert_raises
+from routes import url_for
 from flask import Blueprint
 import flask
 
@@ -29,9 +30,7 @@ def test_homepage_with_middleware_activated(self):
         We are just testing the home page renders without any troubles and that
         the middleware has not done anything strange to the response string'''
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            response = app.get(
-                url=h.url_for(controller='home', action='index'))
+        response = app.get(url=url_for(controller='home', action='index'))
 
         assert_equals(200, response.status_int)
         # make sure we haven't overwritten the response too early.
diff --git a/ckan/tests/controllers/test_admin.py b/ckan/tests/controllers/test_admin.py
index 7b1c6067839..8915c489d92 100644
--- a/ckan/tests/controllers/test_admin.py
+++ b/ckan/tests/controllers/test_admin.py
@@ -3,7 +3,7 @@
 from nose.tools import assert_true, assert_equal
 
 from bs4 import BeautifulSoup
-from ckan.lib.helpers import url_for
+from routes import url_for
 from ckan.common import config
 
 import ckan.model as model
@@ -19,10 +19,8 @@
 def _get_admin_config_page(app):
     user = factories.Sysadmin()
     env = {'REMOTE_USER': user['name'].encode('ascii')}
-    with app.flask_app.test_request_context():
-        url = url_for(controller='admin', action='config')
     response = app.get(
-        url=url,
+        url=url_for(controller='admin', action='config'),
         extra_environ=env,
     )
     return env, response
@@ -32,10 +30,8 @@ def _reset_config(app):
     '''Reset config via action'''
     user = factories.Sysadmin()
     env = {'REMOTE_USER': user['name'].encode('ascii')}
-    with app.flask_app.test_request_context():
-        url = url_for(controller='admin', action='reset_config')
     app.post(
-        url=url,
+        url=url_for(controller='admin', action='reset_config'),
         extra_environ=env,
     )
 
@@ -266,9 +262,9 @@ class TestTrashView(helpers.FunctionalTestBase):
     def test_trash_view_anon_user(self):
         '''An anon user shouldn't be able to access trash view.'''
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            trash_url = url_for(controller='admin', action='trash')
-        app.get(trash_url, status=403)
+
+        trash_url = url_for(controller='admin', action='trash')
+        trash_response = app.get(trash_url, status=403)
 
     def test_trash_view_normal_user(self):
         '''A normal logged in user shouldn't be able to access trash view.'''
@@ -276,9 +272,7 @@ def test_trash_view_normal_user(self):
         app = self._get_test_app()
 
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            trash_url = url_for(controller='admin', action='trash')
+        trash_url = url_for(controller='admin', action='trash')
         trash_response = app.get(trash_url, extra_environ=env, status=403)
         assert_true('Need to be system administrator to administer'
                     in trash_response)
@@ -289,9 +283,7 @@ def test_trash_view_sysadmin(self):
         app = self._get_test_app()
 
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            trash_url = url_for(controller='admin', action='trash')
+        trash_url = url_for(controller='admin', action='trash')
         trash_response = app.get(trash_url, extra_environ=env, status=200)
         # On the purge page
         assert_true('form-purge-packages' in trash_response)
@@ -304,8 +296,7 @@ def test_trash_no_datasets(self):
         app = self._get_test_app()
 
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            trash_url = url_for(controller='admin', action='trash')
+        trash_url = url_for(controller='admin', action='trash')
         trash_response = app.get(trash_url, extra_environ=env, status=200)
 
         trash_response_html = BeautifulSoup(trash_response.body)
@@ -324,8 +315,7 @@ def test_trash_with_deleted_datasets(self):
         app = self._get_test_app()
 
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            trash_url = url_for(controller='admin', action='trash')
+        trash_url = url_for(controller='admin', action='trash')
         trash_response = app.get(trash_url, extra_environ=env, status=200)
 
         trash_response_html = BeautifulSoup(trash_response.body)
@@ -348,8 +338,7 @@ def test_trash_purge_deleted_datasets(self):
         assert_equal(pkgs_before_purge, 3)
 
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            trash_url = url_for(controller='admin', action='trash')
+        trash_url = url_for(controller='admin', action='trash')
         trash_response = app.get(trash_url, extra_environ=env, status=200)
 
         # submit the purge form
@@ -375,8 +364,7 @@ def _update_config_option(self):
         sysadmin = factories.Sysadmin()
         env = {'REMOTE_USER': sysadmin['name'].encode('ascii')}
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='admin', action='config')
+        url = url_for(controller='admin', action='config')
 
         response = app.get(url=url, extra_environ=env)
         form = response.forms[1]
diff --git a/ckan/tests/controllers/test_api.py b/ckan/tests/controllers/test_api.py
index def1a1aaea0..d674bb02f66 100644
--- a/ckan/tests/controllers/test_api.py
+++ b/ckan/tests/controllers/test_api.py
@@ -7,7 +7,7 @@
 import json
 import re
 
-from ckan.lib.helpers import url_for
+from routes import url_for
 from nose.tools import assert_equal, assert_in, eq_
 
 import ckan.tests.helpers as helpers
@@ -30,12 +30,9 @@ def test_unicode_in_error_message_works_ok(self):
 
     def test_dataset_autocomplete_name(self):
         dataset = factories.Dataset(name='rivers')
-
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='api', action='dataset_autocomplete',
-                          ver='/2')
+        url = url_for(controller='api', action='dataset_autocomplete', ver='/2')
         assert_equal(url, '/api/2/util/dataset/autocomplete')
+        app = self._get_test_app()
 
         response = app.get(
             url=url,
@@ -57,11 +54,7 @@ def test_dataset_autocomplete_name(self):
 
     def test_dataset_autocomplete_title(self):
         dataset = factories.Dataset(name='test_ri', title='Rivers')
-
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='api', action='dataset_autocomplete',
-                          ver='/2')
+        url = url_for(controller='api', action='dataset_autocomplete', ver='/2')
         assert_equal(url, '/api/2/util/dataset/autocomplete')
         app = self._get_test_app()
 
@@ -85,12 +78,9 @@ def test_dataset_autocomplete_title(self):
 
     def test_tag_autocomplete(self):
         factories.Dataset(tags=[{'name': 'rivers'}])
-
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='api', action='tag_autocomplete',
-                          ver='/2')
+        url = url_for(controller='api', action='tag_autocomplete', ver='/2')
         assert_equal(url, '/api/2/util/tag/autocomplete')
+        app = self._get_test_app()
 
         response = app.get(
             url=url,
@@ -106,12 +96,10 @@ def test_tag_autocomplete(self):
                      'application/json;charset=utf-8')
 
     def test_group_autocomplete_by_name(self):
-        factories.Group(name='rivers', title='Bridges')
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='api', action='group_autocomplete',
-                          ver='/2')
+        org = factories.Group(name='rivers', title='Bridges')
+        url = url_for(controller='api', action='group_autocomplete', ver='/2')
         assert_equal(url, '/api/2/util/group/autocomplete')
+        app = self._get_test_app()
 
         response = app.get(
             url=url,
@@ -129,11 +117,9 @@ def test_group_autocomplete_by_name(self):
                      'application/json;charset=utf-8')
 
     def test_group_autocomplete_by_title(self):
-        factories.Group(name='frogs', title='Bugs')
+        org = factories.Group(name='frogs', title='Bugs')
+        url = url_for(controller='api', action='group_autocomplete', ver='/2')
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='api', action='group_autocomplete',
-                          ver='/2')
 
         response = app.get(
             url=url,
@@ -149,12 +135,9 @@ def test_group_autocomplete_by_title(self):
 
     def test_organization_autocomplete_by_name(self):
         org = factories.Organization(name='simple-dummy-org')
-
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='api', action='organization_autocomplete',
-                          ver='/2')
+        url = url_for(controller='api', action='organization_autocomplete', ver='/2')
         assert_equal(url, '/api/2/util/organization/autocomplete')
+        app = self._get_test_app()
 
         response = app.get(
             url=url,
@@ -172,12 +155,9 @@ def test_organization_autocomplete_by_name(self):
                      'application/json;charset=utf-8')
 
     def test_organization_autocomplete_by_title(self):
-        factories.Organization(title='Simple dummy org')
-
+        org = factories.Organization(title='Simple dummy org')
+        url = url_for(controller='api', action='organization_autocomplete', ver='/2')
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='api', action='organization_autocomplete',
-                          ver='/2')
 
         response = app.get(
             url=url,
@@ -193,14 +173,12 @@ def test_organization_autocomplete_by_title(self):
 
     def test_config_option_list_access_sysadmin(self):
         user = factories.Sysadmin()
-
+        url = url_for(
+            controller='api',
+            action='action',
+            logic_function='config_option_list',
+            ver='/3')
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(
-                controller='api',
-                action='action',
-                logic_function='config_option_list',
-                ver='/3')
 
         app.get(
             url=url,
@@ -211,14 +189,12 @@ def test_config_option_list_access_sysadmin(self):
 
     def test_config_option_list_access_sysadmin_jsonp(self):
         user = factories.Sysadmin()
-
+        url = url_for(
+            controller='api',
+            action='action',
+            logic_function='config_option_list',
+            ver='/3')
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(
-                controller='api',
-                action='action',
-                logic_function='config_option_list',
-                ver='/3')
 
         app.get(
             url=url,
@@ -232,13 +208,12 @@ def test_jsonp_works_on_get_requests(self):
         dataset1 = factories.Dataset()
         dataset2 = factories.Dataset()
 
+        url = url_for(
+            controller='api',
+            action='action',
+            logic_function='package_list',
+            ver='/3')
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(
-                controller='api',
-                action='action',
-                logic_function='package_list',
-                ver='/3')
         res = app.get(
             url=url,
             params={'callback': 'my_callback'},
@@ -255,15 +230,15 @@ def test_jsonp_does_not_work_on_post_requests(self):
 
         dataset1 = factories.Dataset()
         dataset2 = factories.Dataset()
+
+        url = url_for(
+            controller='api',
+            action='action',
+            logic_function='package_list',
+            ver='/3',
+            callback='my_callback',
+        )
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(
-                controller='api',
-                action='action',
-                logic_function='package_list',
-                ver='/3',
-                callback='my_callback',
-            )
         res = app.post(
             url=url,
         )
diff --git a/ckan/tests/controllers/test_feed.py b/ckan/tests/controllers/test_feed.py
index 614eab8befb..ba256d446ba 100644
--- a/ckan/tests/controllers/test_feed.py
+++ b/ckan/tests/controllers/test_feed.py
@@ -17,40 +17,32 @@ def teardown_class(cls):
 
     def test_atom_feed_page_zero_gives_error(self):
         group = factories.Group()
-
+        offset = url_for(controller='feed', action='group',
+                         id=group['name']) + '?page=0'
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='feed', action='group',
-                             id=group['name']) + '?page=0'
         res = app.get(offset, status=400)
         assert '"page" parameter must be a positive integer' in res, res
 
     def test_atom_feed_page_negative_gives_error(self):
         group = factories.Group()
-
+        offset = url_for(controller='feed', action='group',
+                         id=group['name']) + '?page=-2'
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='feed', action='group',
-                             id=group['name']) + '?page=-2'
         res = app.get(offset, status=400)
         assert '"page" parameter must be a positive integer' in res, res
 
     def test_atom_feed_page_not_int_gives_error(self):
         group = factories.Group()
-
+        offset = url_for(controller='feed', action='group',
+                         id=group['name']) + '?page=abc'
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='feed', action='group',
-                             id=group['name']) + '?page=abc'
         res = app.get(offset, status=400)
         assert '"page" parameter must be a positive integer' in res, res
 
     def test_general_atom_feed_works(self):
         dataset = factories.Dataset()
-
+        offset = url_for(controller='feed', action='general')
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='feed', action='general')
         res = app.get(offset)
 
         assert '<title>{0}</title>'.format(dataset['title']) in res.body
@@ -58,11 +50,9 @@ def test_general_atom_feed_works(self):
     def test_group_atom_feed_works(self):
         group = factories.Group()
         dataset = factories.Dataset(groups=[{'id': group['id']}])
-
+        offset = url_for(controller='feed', action='group',
+                         id=group['name'])
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='feed', action='group',
-                             id=group['name'])
         res = app.get(offset)
 
         assert '<title>{0}</title>'.format(dataset['title']) in res.body
@@ -70,11 +60,9 @@ def test_group_atom_feed_works(self):
     def test_organization_atom_feed_works(self):
         group = factories.Organization()
         dataset = factories.Dataset(owner_org=group['id'])
-
+        offset = url_for(controller='feed', action='organization',
+                         id=group['name'])
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='feed', action='organization',
-                             id=group['name'])
         res = app.get(offset)
 
         assert '<title>{0}</title>'.format(dataset['title']) in res.body
@@ -86,13 +74,11 @@ def test_custom_atom_feed_works(self):
         dataset2 = factories.Dataset(
             title='Test daily',
             extras=[{'key': 'frequency', 'value': 'daily'}])
-
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='feed', action='custom')
+        offset = url_for(controller='feed', action='custom')
         params = {
             'q': 'frequency:weekly'
         }
+        app = self._get_test_app()
         res = app.get(offset, params=params)
 
         assert '<title>{0}</title>'.format(dataset1['title']) in res.body
diff --git a/ckan/tests/controllers/test_group.py b/ckan/tests/controllers/test_group.py
index 0c92b30d970..a23b38ded3c 100644
--- a/ckan/tests/controllers/test_group.py
+++ b/ckan/tests/controllers/test_group.py
@@ -3,7 +3,7 @@
 from bs4 import BeautifulSoup
 from nose.tools import assert_equal, assert_true, assert_in
 
-from ckan.lib.helpers import url_for
+from routes import url_for
 
 import ckan.tests.helpers as helpers
 import ckan.model as model
@@ -19,22 +19,17 @@ def setup(self):
         model.repo.rebuild_db()
 
     def test_bulk_process_throws_404_for_nonexistent_org(self):
-
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            bulk_process_url = url_for(
-                controller='organization', action='bulk_process',
-                id='does-not-exist')
+        bulk_process_url = url_for(controller='organization',
+                                   action='bulk_process', id='does-not-exist')
         app.get(url=bulk_process_url, status=404)
 
     def test_page_thru_list_of_orgs_preserves_sort_order(self):
         orgs = [factories.Organization() for _ in range(35)]
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            org_url = url_for(controller='organization',
-                              action='index',
-                              sort='name desc')
+        org_url = url_for(controller='organization',
+                          action='index',
+                          sort='name desc')
         response = app.get(url=org_url)
         assert orgs[-1]['name'] in response
         assert orgs[0]['name'] not in response
@@ -46,11 +41,9 @@ def test_page_thru_list_of_orgs_preserves_sort_order(self):
     def test_page_thru_list_of_groups_preserves_sort_order(self):
         groups = [factories.Group() for _ in range(35)]
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            group_url = url_for(controller='group',
-                                action='index',
-                                sort='title desc')
+        group_url = url_for(controller='group',
+                            action='index',
+                            sort='title desc')
 
         response = app.get(url=group_url)
         assert groups[-1]['title'] in response
@@ -80,11 +73,8 @@ def test_invalid_sort_param_does_not_crash(self):
 def _get_group_new_page(app):
     user = factories.User()
     env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-    with app.flask_app.test_request_context():
-        url = url_for(controller='group', action='new')
     response = app.get(
-        url=url,
+        url=url_for(controller='group', action='new'),
         extra_environ=env,
     )
     return env, response
@@ -93,9 +83,7 @@ def _get_group_new_page(app):
 class TestGroupControllerNew(helpers.FunctionalTestBase):
     def test_not_logged_in(self):
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group', action='new')
-        app.get(url=url,
+        app.get(url=url_for(controller='group', action='new'),
                 status=403)
 
     def test_form_renders(self):
@@ -145,11 +133,9 @@ def _get_group_edit_page(app, group_name=None):
         group = factories.Group(user=user)
         group_name = group['name']
     env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-    with app.flask_app.test_request_context():
-        url = url_for(controller='group',
-                      action='edit',
-                      id=group_name)
+    url = url_for(controller='group',
+                  action='edit',
+                  id=group_name)
     response = app.get(url=url, extra_environ=env)
     return env, response, group_name
 
@@ -157,21 +143,16 @@ def _get_group_edit_page(app, group_name=None):
 class TestGroupControllerEdit(helpers.FunctionalTestBase):
     def test_not_logged_in(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group', action='new')
-        app.get(url=url,
+        app.get(url=url_for(controller='group', action='new'),
                 status=403)
 
     def test_group_doesnt_exist(self):
         app = self._get_test_app()
         user = factories.User()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group',
-                          action='edit',
-                          id='doesnt_exist')
+        url = url_for(controller='group',
+                      action='edit',
+                      id='doesnt_exist')
         app.get(url=url, extra_environ=env,
                 status=404)
 
@@ -208,19 +189,17 @@ def test_all_fields_saved(self):
 class TestGroupRead(helpers.FunctionalTestBase):
     def setup(self):
         super(TestGroupRead, self).setup()
+        self.app = helpers._get_test_app()
         self.user = factories.User()
         self.user_env = {'REMOTE_USER': self.user['name'].encode('ascii')}
         self.group = factories.Group(user=self.user)
 
     def test_group_read(self):
-
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group', action='read',
-                          id=self.group['id'])
-        response = app.get(url=url,
-                           status=200,
-                           extra_environ=self.user_env)
+        response = self.app.get(url=url_for(controller='group',
+                                            action='read',
+                                            id=self.group['id']),
+                                status=200,
+                                extra_environ=self.user_env)
         assert_in(self.group['title'], response)
         assert_in(self.group['description'], response)
 
@@ -234,69 +213,53 @@ def setup(self):
         self.group = factories.Group(user=self.user)
 
     def test_owner_delete(self):
-
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group', action='delete',
-                          id=self.group['id'])
-
-        response = app.get(url=url,
-                           status=200,
-                           extra_environ=self.user_env)
+        response = self.app.get(url=url_for(controller='group',
+                                            action='delete',
+                                            id=self.group['id']),
+                                status=200,
+                                extra_environ=self.user_env)
 
         form = response.forms['group-confirm-delete-form']
-        response = submit_and_follow(app, form, name='delete',
+        response = submit_and_follow(self.app, form, name='delete',
                                      extra_environ=self.user_env)
         group = helpers.call_action('group_show',
                                     id=self.group['id'])
         assert_equal(group['state'], 'deleted')
 
     def test_sysadmin_delete(self):
-
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group', action='delete',
-                          id=self.group['id'])
-
         sysadmin = factories.Sysadmin()
         extra_environ = {'REMOTE_USER': sysadmin['name'].encode('ascii')}
-        response = app.get(url=url,
-                           status=200,
-                           extra_environ=extra_environ)
+        response = self.app.get(url=url_for(controller='group',
+                                            action='delete',
+                                            id=self.group['id']),
+                                status=200,
+                                extra_environ=extra_environ)
 
         form = response.forms['group-confirm-delete-form']
-        response = submit_and_follow(app, form, name='delete',
+        response = submit_and_follow(self.app, form, name='delete',
                                      extra_environ=self.user_env)
         group = helpers.call_action('group_show',
                                     id=self.group['id'])
         assert_equal(group['state'], 'deleted')
 
     def test_non_authorized_user_trying_to_delete_fails(self):
-
-        app = self._get_test_app()
         user = factories.User()
         extra_environ = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group', action='delete',
-                          id=self.group['id'])
-
-        app.get(url=url,
-                status=403,
-                extra_environ=extra_environ)
+        self.app.get(url=url_for(controller='group',
+                                 action='delete',
+                                 id=self.group['id']),
+                     status=403,
+                     extra_environ=extra_environ)
 
         group = helpers.call_action('group_show',
                                     id=self.group['id'])
         assert_equal(group['state'], 'active')
 
     def test_anon_user_trying_to_delete_fails(self):
-
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group', action='delete',
-                          id=self.group['id'])
-
-        app.get(url=url,
-                status=403)
+        self.app.get(url=url_for(controller='group',
+                                 action='delete',
+                                 id=self.group['id']),
+                     status=403)
 
         group = helpers.call_action('group_show',
                                     id=self.group['id'])
@@ -317,11 +280,9 @@ def _create_group(self, owner_username, users=None):
 
     def _get_group_add_member_page(self, app, user, group_name):
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group',
-                          action='member_new',
-                          id=group_name)
+        url = url_for(controller='group',
+                      action='member_new',
+                      id=group_name)
         response = app.get(url=url, extra_environ=env)
         return env, response
 
@@ -337,14 +298,12 @@ def test_membership_list(self):
 
         group = self._create_group(user_one['name'], other_users)
 
-        with app.flask_app.test_request_context():
-            member_list_url = url_for(controller='group', action='members',
-                                      id=group['id'])
-
-            env = {'REMOTE_USER': user_one['name'].encode('ascii')}
+        member_list_url = url_for(controller='group', action='members',
+                                  id=group['id'])
+        env = {'REMOTE_USER': user_one['name'].encode('ascii')}
 
-            member_list_response = app.get(
-                member_list_url, extra_environ=env)
+        member_list_response = app.get(
+            member_list_url, extra_environ=env)
 
         assert_true('2 members' in member_list_response)
 
@@ -429,9 +388,8 @@ def test_remove_member(self):
 
         group = self._create_group(user_one['name'], other_users)
 
-        with app.flask_app.test_request_context():
-            remove_url = url_for(controller='group', action='member_delete',
-                                 user=user_two['id'], id=group['id'])
+        remove_url = url_for(controller='group', action='member_delete',
+                             user=user_two['id'], id=group['id'])
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
         remove_response = app.post(remove_url, extra_environ=env, status=302)
@@ -521,11 +479,9 @@ def test_group_follow(self):
         group = factories.Group()
 
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='group',
-                                 action='follow',
-                                 id=group['id'])
+        follow_url = url_for(controller='group',
+                             action='follow',
+                             id=group['id'])
         response = app.post(follow_url, extra_environ=env, status=302)
         response = response.follow()
         assert_true('You are now following {0}'
@@ -539,11 +495,9 @@ def test_group_follow_not_exist(self):
         user_one = factories.User()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='group',
-                                 action='follow',
-                                 id='not-here')
+        follow_url = url_for(controller='group',
+                             action='follow',
+                             id='not-here')
         response = app.post(follow_url, extra_environ=env, status=404)
         assert_true('Group not found' in response)
 
@@ -554,16 +508,13 @@ def test_group_unfollow(self):
         group = factories.Group()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='group',
-                                 action='follow',
-                                 id=group['id'])
-            unfollow_url = url_for(controller='group', action='unfollow',
-                                   id=group['id'])
-
+        follow_url = url_for(controller='group',
+                             action='follow',
+                             id=group['id'])
         app.post(follow_url, extra_environ=env, status=302)
 
+        unfollow_url = url_for(controller='group', action='unfollow',
+                               id=group['id'])
         unfollow_response = app.post(unfollow_url, extra_environ=env,
                                      status=302)
         unfollow_response = unfollow_response.follow()
@@ -580,10 +531,8 @@ def test_group_unfollow_not_following(self):
         group = factories.Group()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            unfollow_url = url_for(controller='group', action='unfollow',
-                                   id=group['id'])
+        unfollow_url = url_for(controller='group', action='unfollow',
+                               id=group['id'])
         unfollow_response = app.post(unfollow_url, extra_environ=env,
                                      status=302)
         unfollow_response = unfollow_response.follow()
@@ -598,10 +547,8 @@ def test_group_unfollow_not_exist(self):
         user_one = factories.User()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            unfollow_url = url_for(controller='group', action='unfollow',
-                                   id='not-here')
+        unfollow_url = url_for(controller='group', action='unfollow',
+                               id='not-here')
         unfollow_response = app.post(unfollow_url, extra_environ=env,
                                      status=404)
         assert_true('Group not found' in unfollow_response)
@@ -614,16 +561,14 @@ def test_group_follower_list(self):
         group = factories.Group()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='group',
-                                 action='follow',
-                                 id=group['id'])
-            followers_url = url_for(controller='group', action='followers',
-                                    id=group['id'])
-
+        follow_url = url_for(controller='group',
+                             action='follow',
+                             id=group['id'])
         app.post(follow_url, extra_environ=env, status=302)
 
+        followers_url = url_for(controller='group', action='followers',
+                                id=group['id'])
+
         # Only sysadmins can view the followers list pages
         followers_response = app.get(followers_url, extra_environ=env,
                                      status=200)
@@ -636,20 +581,17 @@ class TestGroupSearch(helpers.FunctionalTestBase):
 
     def setup(self):
         super(TestGroupSearch, self).setup()
+        self.app = self._get_test_app()
         factories.Group(name='grp-one', title='AGrp One')
         factories.Group(name='grp-two', title='AGrp Two')
         factories.Group(name='grp-three', title='Grp Three')
-
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            self.search_url = url_for(controller='group', action='index')
+        self.search_url = url_for(controller='group', action='index')
 
     def test_group_search(self):
         '''Requesting group search (index) returns list of groups and search
         form.'''
 
-        app = self._get_test_app()
-        index_response = app.get(self.search_url)
+        index_response = self.app.get(self.search_url)
         index_response_html = BeautifulSoup(index_response.body)
         grp_names = index_response_html.select('ul.media-grid '
                                                'li.media-item '
@@ -664,8 +606,7 @@ def test_group_search(self):
     def test_group_search_results(self):
         '''Searching via group search form returns list of expected groups.'''
 
-        app = self._get_test_app()
-        index_response = app.get(self.search_url)
+        index_response = self.app.get(self.search_url)
         search_form = index_response.forms['group-search-form']
         search_form['q'] = 'AGrp'
         search_response = webtest_submit(search_form)
@@ -684,8 +625,7 @@ def test_group_search_results(self):
     def test_group_search_no_results(self):
         '''Searching with a term that doesn't apply returns no results.'''
 
-        app = self._get_test_app()
-        index_response = app.get(self.search_url)
+        index_response = self.app.get(self.search_url)
         search_form = index_response.forms['group-search-form']
         search_form['q'] = 'No Results Here'
         search_response = webtest_submit(search_form)
@@ -717,9 +657,8 @@ def test_group_search_within_org(self):
         factories.Dataset(name="ds-three", title="Dataset Three",
                           groups=[{'id': grp['id']}])
 
-        with app.flask_app.test_request_context():
-            grp_url = url_for(controller='group', action='read',
-                              id=grp['id'])
+        grp_url = url_for(controller='group', action='read',
+                          id=grp['id'])
         grp_response = app.get(grp_url)
         grp_response_html = BeautifulSoup(grp_response.body)
 
@@ -746,9 +685,8 @@ def test_group_search_within_org_results(self):
         factories.Dataset(name="ds-three", title="Dataset Three",
                           groups=[{'id': grp['id']}])
 
-        with app.flask_app.test_request_context():
-            grp_url = url_for(controller='group', action='read',
-                              id=grp['id'])
+        grp_url = url_for(controller='group', action='read',
+                          id=grp['id'])
         grp_response = app.get(grp_url)
         search_form = grp_response.forms['group-datasets-search-form']
         search_form['q'] = 'One'
@@ -780,9 +718,8 @@ def test_group_search_within_org_no_results(self):
         factories.Dataset(name="ds-three", title="Dataset Three",
                           groups=[{'id': grp['id']}])
 
-        with app.flask_app.test_request_context():
-            grp_url = url_for(controller='group', action='read',
-                              id=grp['id'])
+        grp_url = url_for(controller='group', action='read',
+                          id=grp['id'])
         grp_response = app.get(grp_url)
         search_form = grp_response.forms['group-datasets-search-form']
         search_form['q'] = 'Nout'
@@ -811,9 +748,8 @@ def test_group_index(self):
                 name='test-group-{0}'.format(_i),
                 title='Test Group {0}'.format(_i))
 
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group',
-                          action='index')
+        url = url_for(controller='group',
+                      action='index')
         response = app.get(url)
 
         for i in xrange(1, 22):
@@ -822,10 +758,9 @@ def test_group_index(self):
 
         assert 'Test Group 22' not in response
 
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group',
-                          action='index',
-                          page=1)
+        url = url_for(controller='group',
+                      action='index',
+                      page=1)
         response = app.get(url)
 
         for i in xrange(1, 22):
@@ -834,10 +769,9 @@ def test_group_index(self):
 
         assert 'Test Group 22' not in response
 
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group',
-                          action='index',
-                          page=2)
+        url = url_for(controller='group',
+                      action='index',
+                      page=2)
         response = app.get(url)
 
         for i in xrange(22, 26):
diff --git a/ckan/tests/controllers/test_home.py b/ckan/tests/controllers/test_home.py
index 34c02739840..44731868635 100644
--- a/ckan/tests/controllers/test_home.py
+++ b/ckan/tests/controllers/test_home.py
@@ -12,11 +12,7 @@ class TestHome(helpers.FunctionalTestBase):
 
     def test_home_renders(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for('home')
-
-        response = app.get(url)
+        response = app.get(url_for('home'))
         assert 'Welcome to CKAN' in response.body
 
     def test_template_head_end(self):
@@ -24,22 +20,14 @@ def test_template_head_end(self):
         # test-core.ini sets ckan.template_head_end to this:
         test_link = '<link rel="stylesheet" ' \
             'href="TEST_TEMPLATE_HEAD_END.css" type="text/css">'
-
-        with app.flask_app.test_request_context():
-            url = url_for('home')
-
-        response = app.get(url)
+        response = app.get(url_for('home'))
         assert test_link in response.body
 
     def test_template_footer_end(self):
         app = self._get_test_app()
         # test-core.ini sets ckan.template_footer_end to this:
         test_html = '<strong>TEST TEMPLATE_FOOTER_END TEST</strong>'
-
-        with app.flask_app.test_request_context():
-            url = url_for('home')
-
-        response = app.get(url)
+        response = app.get(url_for('home'))
         assert test_html in response.body
 
     def test_email_address_nag(self):
@@ -53,14 +41,10 @@ def test_email_address_nag(self):
         model.Session.commit()
         env = {'REMOTE_USER': user.name.encode('ascii')}
 
-        with app.flask_app.test_request_context():
-            url = url_for('home')
-            user_edit_url = url_for(controller='user', action='edit')
-
-        response = app.get(url, extra_environ=env)
+        response = app.get(url=url_for('home'), extra_environ=env)
 
         assert 'update your profile' in response.body
-        assert user_edit_url in response.body
+        assert url_for(controller='user', action='edit') in response.body
         assert ' and add your email address.' in response.body
 
     def test_email_address_no_nag(self):
@@ -68,10 +52,7 @@ def test_email_address_no_nag(self):
         user = factories.User(email='filled_in@nicely.com')
         env = {'REMOTE_USER': user['name'].encode('ascii')}
 
-        with app.flask_app.test_request_context():
-            url = url_for('home')
-
-        response = app.get(url, extra_environ=env)
+        response = app.get(url=url_for('home'), extra_environ=env)
 
         assert 'add your email address' not in response
 
@@ -80,11 +61,7 @@ class TestI18nURLs(helpers.FunctionalTestBase):
 
     def test_right_urls_are_rendered_on_language_selector(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for('home')
-
-        response = app.get(url)
+        response = app.get(url_for('home'))
         html = BeautifulSoup(response.body)
 
         select = html.find(id='field-lang-select')
@@ -100,11 +77,7 @@ def test_right_urls_are_rendered_on_language_selector(self):
 
     def test_default_english_option_is_selected_on_language_selector(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for('home')
-
-        response = app.get(url)
+        response = app.get(url_for('home'))
         html = BeautifulSoup(response.body)
 
         select = html.find(id='field-lang-select')
@@ -116,11 +89,7 @@ def test_default_english_option_is_selected_on_language_selector(self):
 
     def test_right_option_is_selected_on_language_selector(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for('home', locale='ca')
-
-        response = app.get(url)
+        response = app.get(url_for('home', locale='ca'))
         html = BeautifulSoup(response.body)
 
         select = html.find(id='field-lang-select')
diff --git a/ckan/tests/controllers/test_organization.py b/ckan/tests/controllers/test_organization.py
index f5c82ec7a12..1b0b66d1e0a 100644
--- a/ckan/tests/controllers/test_organization.py
+++ b/ckan/tests/controllers/test_organization.py
@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 from bs4 import BeautifulSoup
-from ckan.lib.helpers import url_for
 from nose.tools import assert_equal, assert_true, assert_in
+from routes import url_for
 from mock import patch
 
 from ckan.tests import factories, helpers
@@ -12,29 +12,19 @@
 class TestOrganizationNew(helpers.FunctionalTestBase):
     def setup(self):
         super(TestOrganizationNew, self).setup()
-
+        self.app = helpers._get_test_app()
         self.user = factories.User()
         self.user_env = {'REMOTE_USER': self.user['name'].encode('ascii')}
-
-        app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            self.organization_new_url = url_for(controller='organization',
-                                                action='new')
+        self.organization_new_url = url_for(controller='organization',
+                                            action='new')
 
     def test_not_logged_in(self):
-
-        app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='group', action='new')
-        app.get(url, status=403)
+        self.app.get(url=url_for(controller='group', action='new'),
+                     status=403)
 
     def test_name_required(self):
-
-        app = helpers._get_test_app()
-
-        response = app.get(url=self.organization_new_url,
-                           extra_environ=self.user_env)
+        response = self.app.get(url=self.organization_new_url,
+                                extra_environ=self.user_env)
         form = response.forms['organization-edit-form']
         response = webtest_submit(form, name='save',
                                   extra_environ=self.user_env)
@@ -43,16 +33,13 @@ def test_name_required(self):
         assert_true('Name: Missing value' in response)
 
     def test_saved(self):
-
-        app = helpers._get_test_app()
-
-        response = app.get(url=self.organization_new_url,
-                           extra_environ=self.user_env)
+        response = self.app.get(url=self.organization_new_url,
+                                extra_environ=self.user_env)
 
         form = response.forms['organization-edit-form']
         form['name'] = u'saved'
 
-        response = submit_and_follow(app, form, name='save',
+        response = submit_and_follow(self.app, form, name='save',
                                      extra_environ=self.user_env)
         group = helpers.call_action('organization_show', id='saved')
         assert_equal(group['title'], u'')
@@ -60,7 +47,6 @@ def test_saved(self):
         assert_equal(group['state'], 'active')
 
     def test_all_fields_saved(self):
-
         app = helpers._get_test_app()
         response = app.get(url=self.organization_new_url,
                            extra_environ=self.user_env)
@@ -71,7 +57,7 @@ def test_all_fields_saved(self):
         form['description'] = 'Sciencey datasets'
         form['image_url'] = 'http://example.com/image.png'
 
-        response = submit_and_follow(app, form, name='save',
+        response = submit_and_follow(self.app, form, name='save',
                                      extra_environ=self.user_env)
         group = helpers.call_action('organization_show', id='all-fields-saved')
         assert_equal(group['title'], u'Science')
@@ -81,44 +67,33 @@ def test_all_fields_saved(self):
 class TestOrganizationList(helpers.FunctionalTestBase):
     def setup(self):
         super(TestOrganizationList, self).setup()
-
+        self.app = helpers._get_test_app()
         self.user = factories.User()
         self.user_env = {'REMOTE_USER': self.user['name'].encode('ascii')}
-        app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            self.organization_list_url = url_for(controller='organization',
-                                                 action='index')
-
-    @patch('ckan.logic.auth.get.organization_list',
-           return_value={'success': False})
-    def test_error_message_shown_when_no_organization_list_permission(
-            self, mock_check_access):
-
-        app = helpers._get_test_app()
+        self.organization_list_url = url_for(controller='organization',
+                                             action='index')
 
-        app.get(url=self.organization_list_url,
-                extra_environ=self.user_env,
-                status=403)
+    @patch('ckan.logic.auth.get.organization_list', return_value={'success': False})
+    def test_error_message_shown_when_no_organization_list_permission(self, mock_check_access):
+        response = self.app.get(url=self.organization_list_url,
+                                extra_environ=self.user_env,
+                                status=403)
 
 
 class TestOrganizationRead(helpers.FunctionalTestBase):
     def setup(self):
         super(TestOrganizationRead, self).setup()
-
+        self.app = helpers._get_test_app()
         self.user = factories.User()
         self.user_env = {'REMOTE_USER': self.user['name'].encode('ascii')}
         self.organization = factories.Organization(user=self.user)
 
     def test_organization_read(self):
-
-        app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='organization', action='read',
-                          id=self.organization['id'])
-        response = app.get(url=url,
-                           status=200,
-                           extra_environ=self.user_env)
+        response = self.app.get(url=url_for(controller='organization',
+                                            action='read',
+                                            id=self.organization['id']),
+                                status=200,
+                                extra_environ=self.user_env)
         assert_in(self.organization['title'], response)
         assert_in(self.organization['description'], response)
 
@@ -126,33 +101,24 @@ def test_organization_read(self):
 class TestOrganizationEdit(helpers.FunctionalTestBase):
     def setup(self):
         super(TestOrganizationEdit, self).setup()
-
+        self.app = helpers._get_test_app()
         self.user = factories.User()
         self.user_env = {'REMOTE_USER': self.user['name'].encode('ascii')}
         self.organization = factories.Organization(user=self.user)
-        app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            self.organization_edit_url = url_for(controller='organization',
-                                                 action='edit',
-                                                 id=self.organization['id'])
+        self.organization_edit_url = url_for(controller='organization',
+                                             action='edit',
+                                             id=self.organization['id'])
 
     def test_group_doesnt_exist(self):
-
-        app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='organization',
-                          action='edit',
-                          id='doesnt_exist')
-        app.get(url=url, extra_environ=self.user_env,
-                status=404)
+        url = url_for(controller='organization',
+                      action='edit',
+                      id='doesnt_exist')
+        self.app.get(url=url, extra_environ=self.user_env,
+                     status=404)
 
     def test_saved(self):
-
-        app = helpers._get_test_app()
-
-        response = app.get(url=self.organization_edit_url,
-                           extra_environ=self.user_env)
+        response = self.app.get(url=self.organization_edit_url,
+                                extra_environ=self.user_env)
 
         form = response.forms['organization-edit-form']
         response = webtest_submit(form, name='save',
@@ -164,11 +130,8 @@ def test_saved(self):
         assert_equal(group['state'], 'active')
 
     def test_all_fields_saved(self):
-
-        app = helpers._get_test_app()
-
-        response = app.get(url=self.organization_edit_url,
-                           extra_environ=self.user_env)
+        response = self.app.get(url=self.organization_edit_url,
+                                extra_environ=self.user_env)
 
         form = response.forms['organization-edit-form']
         form['name'] = u'all-fields-edited'
@@ -188,79 +151,59 @@ def test_all_fields_saved(self):
 class TestOrganizationDelete(helpers.FunctionalTestBase):
     def setup(self):
         super(TestOrganizationDelete, self).setup()
-
+        self.app = helpers._get_test_app()
         self.user = factories.User()
         self.user_env = {'REMOTE_USER': self.user['name'].encode('ascii')}
         self.organization = factories.Organization(user=self.user)
 
     def test_owner_delete(self):
-
-        app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='organization',
-                          action='delete',
-                          id=self.organization['id'])
-        response = app.get(url, status=200, extra_environ=self.user_env)
+        response = self.app.get(url=url_for(controller='organization',
+                                            action='delete',
+                                            id=self.organization['id']),
+                                status=200,
+                                extra_environ=self.user_env)
 
         form = response.forms['organization-confirm-delete-form']
-        response = submit_and_follow(app, form, name='delete',
+        response = submit_and_follow(self.app, form, name='delete',
                                      extra_environ=self.user_env)
         organization = helpers.call_action('organization_show',
                                            id=self.organization['id'])
         assert_equal(organization['state'], 'deleted')
 
     def test_sysadmin_delete(self):
-
-        app = helpers._get_test_app()
-
         sysadmin = factories.Sysadmin()
         extra_environ = {'REMOTE_USER': sysadmin['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            url = url_for(controller='organization',
-                          action='delete',
-                          id=self.organization['id'])
-
-        response = app.get(url=url,
-                           status=200,
-                           extra_environ=extra_environ)
+        response = self.app.get(url=url_for(controller='organization',
+                                            action='delete',
+                                            id=self.organization['id']),
+                                status=200,
+                                extra_environ=extra_environ)
 
         form = response.forms['organization-confirm-delete-form']
-        response = submit_and_follow(app, form, name='delete',
+        response = submit_and_follow(self.app, form, name='delete',
                                      extra_environ=self.user_env)
         organization = helpers.call_action('organization_show',
                                            id=self.organization['id'])
         assert_equal(organization['state'], 'deleted')
 
     def test_non_authorized_user_trying_to_delete_fails(self):
-
-        app = helpers._get_test_app()
-
         user = factories.User()
         extra_environ = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            url = url_for(controller='organization',
-                          action='delete',
-                          id=self.organization['id'])
-
-        app.get(url=url,
-                status=403,
-                extra_environ=extra_environ)
+        self.app.get(url=url_for(controller='organization',
+                                 action='delete',
+                                 id=self.organization['id']),
+                     status=403,
+                     extra_environ=extra_environ)
 
         organization = helpers.call_action('organization_show',
                                            id=self.organization['id'])
         assert_equal(organization['state'], 'active')
 
     def test_anon_user_trying_to_delete_fails(self):
-
-        app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='organization',
-                          action='delete',
-                          id=self.organization['id'])
-
-        app.get(url=url,
-                status=403)
+        self.app.get(url=url_for(controller='organization',
+                                 action='delete',
+                                 id=self.organization['id']),
+                     status=403)
 
         organization = helpers.call_action('organization_show',
                                            id=self.organization['id'])
@@ -270,24 +213,19 @@ def test_anon_user_trying_to_delete_fails(self):
 class TestOrganizationBulkProcess(helpers.FunctionalTestBase):
     def setup(self):
         super(TestOrganizationBulkProcess, self).setup()
-
+        self.app = helpers._get_test_app()
         self.user = factories.User()
         self.user_env = {'REMOTE_USER': self.user['name'].encode('ascii')}
         self.organization = factories.Organization(user=self.user)
-        app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            self.organization_bulk_url = url_for(controller='organization',
-                                                 action='bulk_process',
-                                                 id=self.organization['id'])
+        self.organization_bulk_url = url_for(controller='organization',
+                                             action='bulk_process',
+                                             id=self.organization['id'])
 
     def test_make_private(self):
-
-        app = helpers._get_test_app()
-
         datasets = [factories.Dataset(owner_org=self.organization['id'])
                     for i in range(0, 5)]
-        response = app.get(url=self.organization_bulk_url,
-                           extra_environ=self.user_env)
+        response = self.app.get(url=self.organization_bulk_url,
+                                extra_environ=self.user_env)
         form = response.forms[1]
         for v in form.fields.values():
             try:
@@ -303,14 +241,11 @@ def test_make_private(self):
             assert_equal(d['private'], True)
 
     def test_make_public(self):
-
-        app = helpers._get_test_app()
-
         datasets = [factories.Dataset(owner_org=self.organization['id'],
                                       private=True)
                     for i in range(0, 5)]
-        response = app.get(url=self.organization_bulk_url,
-                           extra_environ=self.user_env)
+        response = self.app.get(url=self.organization_bulk_url,
+                                extra_environ=self.user_env)
         form = response.forms[1]
         for v in form.fields.values():
             try:
@@ -326,14 +261,11 @@ def test_make_public(self):
             assert_equal(d['private'], False)
 
     def test_delete(self):
-
-        app = helpers._get_test_app()
-
         datasets = [factories.Dataset(owner_org=self.organization['id'],
                                       private=True)
                     for i in range(0, 5)]
-        response = app.get(url=self.organization_bulk_url,
-                           extra_environ=self.user_env)
+        response = self.app.get(url=self.organization_bulk_url,
+                                extra_environ=self.user_env)
         form = response.forms[1]
         for v in form.fields.values():
             try:
@@ -355,23 +287,17 @@ class TestOrganizationSearch(helpers.FunctionalTestBase):
 
     def setup(self):
         super(TestOrganizationSearch, self).setup()
+        self.app = self._get_test_app()
         factories.Organization(name='org-one', title='AOrg One')
         factories.Organization(name='org-two', title='AOrg Two')
         factories.Organization(name='org-three', title='Org Three')
-
-        app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            self.search_url = url_for(controller='organization',
-                                      action='index')
+        self.search_url = url_for(controller='organization', action='index')
 
     def test_organization_search(self):
-
-        app = helpers._get_test_app()
-
         '''Requesting organization search (index) returns list of
         organizations and search form.'''
 
-        index_response = app.get(self.search_url)
+        index_response = self.app.get(self.search_url)
         index_response_html = BeautifulSoup(index_response.body)
         org_names = index_response_html.select('ul.media-grid '
                                                'li.media-item '
@@ -384,13 +310,10 @@ def test_organization_search(self):
         assert_true('Org Three' in org_names)
 
     def test_organization_search_results(self):
-
-        app = helpers._get_test_app()
-
         '''Searching via organization search form returns list of expected
         organizations.'''
 
-        index_response = app.get(self.search_url)
+        index_response = self.app.get(self.search_url)
         search_form = index_response.forms['organization-search-form']
         search_form['q'] = 'AOrg'
         search_response = webtest_submit(search_form)
@@ -407,12 +330,9 @@ def test_organization_search_results(self):
         assert_true('Org Three' not in org_names)
 
     def test_organization_search_no_results(self):
-
-        app = helpers._get_test_app()
-
         '''Searching with a term that doesn't apply returns no results.'''
 
-        index_response = app.get(self.search_url)
+        index_response = self.app.get(self.search_url)
         search_form = index_response.forms['organization-search-form']
         search_form['q'] = 'No Results Here'
         search_response = webtest_submit(search_form)
@@ -445,9 +365,8 @@ def test_organization_search_within_org(self):
         factories.Dataset(name="ds-three", title="Dataset Three",
                           owner_org=org['id'])
 
-        with app.flask_app.test_request_context():
-            org_url = url_for(controller='organization', action='read',
-                              id=org['id'])
+        org_url = url_for(controller='organization', action='read',
+                          id=org['id'])
         org_response = app.get(org_url)
         org_response_html = BeautifulSoup(org_response.body)
 
@@ -475,9 +394,8 @@ def test_organization_search_within_org_results(self):
         factories.Dataset(name="ds-three", title="Dataset Three",
                           owner_org=org['id'])
 
-        with app.flask_app.test_request_context():
-            org_url = url_for(controller='organization', action='read',
-                              id=org['id'])
+        org_url = url_for(controller='organization', action='read',
+                          id=org['id'])
         org_response = app.get(org_url)
         search_form = org_response.forms['organization-datasets-search-form']
         search_form['q'] = 'One'
@@ -509,9 +427,8 @@ def test_organization_search_within_org_no_results(self):
         factories.Dataset(name="ds-three", title="Dataset Three",
                           owner_org=org['id'])
 
-        with app.flask_app.test_request_context():
-            org_url = url_for(controller='organization', action='read',
-                              id=org['id'])
+        org_url = url_for(controller='organization', action='read',
+                          id=org['id'])
         org_response = app.get(org_url)
         search_form = org_response.forms['organization-datasets-search-form']
         search_form['q'] = 'Nout'
diff --git a/ckan/tests/controllers/test_package.py b/ckan/tests/controllers/test_package.py
index 845bd3d45c3..b527ba7c34a 100644
--- a/ckan/tests/controllers/test_package.py
+++ b/ckan/tests/controllers/test_package.py
@@ -9,10 +9,12 @@
     assert_in
 )
 
-from ckan.lib.helpers import url_for
+from mock import patch, MagicMock
+from routes import url_for
 
 import ckan.model as model
 import ckan.plugins as p
+from ckan.lib import search
 
 import ckan.tests.helpers as helpers
 import ckan.tests.factories as factories
@@ -25,10 +27,8 @@
 def _get_package_new_page(app):
     user = factories.User()
     env = {'REMOTE_USER': user['name'].encode('ascii')}
-    with app.flask_app.test_request_context():
-        url = url_for(controller='package', action='new')
     response = app.get(
-        url=url,
+        url=url_for(controller='package', action='new'),
         extra_environ=env,
     )
     return env, response
@@ -50,18 +50,12 @@ def test_needs_organization_but_no_organizations_has_button(self):
         sysadmin = factories.Sysadmin()
 
         env = {'REMOTE_USER': sysadmin['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='new')
-
         response = app.get(
-            url=url,
+            url=url_for(controller='package', action='new'),
             extra_environ=env
         )
         assert 'dataset-edit' not in response.forms
-
-        with app.flask_app.test_request_context():
-            assert url_for(controller='organization', action='new') in response
+        assert url_for(controller='organization', action='new') in response
 
     @helpers.mock_auth('ckan.logic.auth.create.package_create')
     @helpers.change_config('ckan.auth.create_unowned_dataset', 'false')
@@ -79,19 +73,13 @@ def test_needs_organization_but_no_organizations_no_button(self,
         user = factories.User()
 
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='new')
-
         response = app.get(
-            url=url,
+            url=url_for(controller='package', action='new'),
             extra_environ=env
         )
 
         assert 'dataset-edit' not in response.forms
-
-        with app.flask_app.test_request_context():
-            assert url_for(controller='organization', action='new') not in response
+        assert url_for(controller='organization', action='new') not in response
         assert 'Ask a system administrator' in response
 
     def test_name_required(self):
@@ -252,11 +240,8 @@ def test_dataset_edit_org_dropdown_visible_to_normal_user_with_orgs_available(se
 
         app = self._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='new')
         response = app.get(
-            url=url,
+            url=url_for(controller='package', action='new'),
             extra_environ=env,
         )
 
@@ -277,11 +262,9 @@ def test_dataset_edit_org_dropdown_visible_to_normal_user_with_orgs_available(se
         assert_equal(pkg.state, 'active')
 
         # edit package page response
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id=pkg.id)
+        url = url_for(controller='package',
+                      action='edit',
+                      id=pkg.id)
         pkg_edit_response = app.get(url=url, extra_environ=env)
         # A field with the correct id is in the response
         form = pkg_edit_response.forms['dataset-edit']
@@ -302,10 +285,8 @@ def test_dataset_edit_org_dropdown_normal_user_can_remove_org(self):
 
         app = self._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='new')
         response = app.get(
-            url=url,
+            url=url_for(controller='package', action='new'),
             extra_environ=env,
         )
 
@@ -325,10 +306,9 @@ def test_dataset_edit_org_dropdown_normal_user_can_remove_org(self):
         assert_not_equal(pkg.owner_org, None)
 
         # edit package page response
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id=pkg.id)
+        url = url_for(controller='package',
+                      action='edit',
+                      id=pkg.id)
         pkg_edit_response = app.get(url=url, extra_environ=env)
 
         # edit dataset
@@ -351,11 +331,8 @@ def test_dataset_edit_org_dropdown_not_visible_to_normal_user_with_no_orgs_avail
 
         app = self._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='new')
         response = app.get(
-            url=url,
+            url=url_for(controller='package', action='new'),
             extra_environ=env,
         )
 
@@ -375,10 +352,9 @@ def test_dataset_edit_org_dropdown_not_visible_to_normal_user_with_no_orgs_avail
         assert_equal(pkg.state, 'active')
 
         # edit package response
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id=model.Package.by_name(u'my-dataset').id)
+        url = url_for(controller='package',
+                      action='edit',
+                      id=model.Package.by_name(u'my-dataset').id)
         pkg_edit_response = app.get(url=url, extra_environ=env)
         # A field with the correct id is in the response
         form = pkg_edit_response.forms['dataset-edit']
@@ -400,10 +376,8 @@ def test_dataset_edit_org_dropdown_visible_to_sysadmin_with_no_orgs_available(se
         app = self._get_test_app()
         # user in env is sysadmin
         env = {'REMOTE_USER': sysadmin['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='new')
         response = app.get(
-            url=url,
+            url=url_for(controller='package', action='new'),
             extra_environ=env,
         )
 
@@ -424,10 +398,9 @@ def test_dataset_edit_org_dropdown_visible_to_sysadmin_with_no_orgs_available(se
         assert_equal(pkg.state, 'active')
 
         # edit package page response
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id=pkg.id)
+        url = url_for(controller='package',
+                      action='edit',
+                      id=pkg.id)
         pkg_edit_response = app.get(url=url, extra_environ=env)
         # A field with the correct id is in the response
         assert 'id="field-organizations"' in pkg_edit_response
@@ -437,14 +410,11 @@ def test_dataset_edit_org_dropdown_visible_to_sysadmin_with_no_orgs_available(se
     def test_unauthed_user_creating_dataset(self):
         app = self._get_test_app()
 
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='new')
         # provide REMOTE_ADDR to idenfity as remote user, see
         # ckan.views.identify_user() for details
-
-        app.post(url=url,
-                 extra_environ={'REMOTE_ADDR': '127.0.0.1'},
-                 status=403)
+        response = app.post(url=url_for(controller='package', action='new'),
+                            extra_environ={'REMOTE_ADDR': '127.0.0.1'},
+                            status=403)
 
 
 class TestPackageEdit(helpers.FunctionalTestBase):
@@ -456,13 +426,10 @@ def test_organization_admin_can_edit(self):
         dataset = factories.Dataset(owner_org=organization['id'])
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id=dataset['name'])
         response = app.get(
-            url,
+            url_for(controller='package',
+                    action='edit',
+                    id=dataset['name']),
             extra_environ=env,
         )
         form = response.forms['dataset-edit']
@@ -480,12 +447,10 @@ def test_organization_editor_can_edit(self):
         dataset = factories.Dataset(owner_org=organization['id'])
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id=dataset['name'])
         response = app.get(
-            url,
+            url_for(controller='package',
+                    action='edit',
+                    id=dataset['name']),
             extra_environ=env,
         )
         form = response.forms['dataset-edit']
@@ -503,12 +468,10 @@ def test_organization_member_cannot_edit(self):
         dataset = factories.Dataset(owner_org=organization['id'])
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id=dataset['name'])
-        app.get(
-            url,
+        response = app.get(
+            url_for(controller='package',
+                    action='edit',
+                    id=dataset['name']),
             extra_environ=env,
             status=403,
         )
@@ -519,20 +482,19 @@ def test_user_not_in_organization_cannot_edit(self):
         dataset = factories.Dataset(owner_org=organization['id'])
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id=dataset['name'])
-        app.get(
-            url,
+        response = app.get(
+            url_for(controller='package',
+                    action='edit',
+                    id=dataset['name']),
             extra_environ=env,
             status=403,
         )
 
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        app.post(
-            url,
+        response = app.post(
+            url_for(controller='package',
+                    action='edit',
+                    id=dataset['name']),
             {'notes': 'edited description'},
             extra_environ=env,
             status=403,
@@ -542,17 +504,17 @@ def test_anonymous_user_cannot_edit(self):
         organization = factories.Organization()
         dataset = factories.Dataset(owner_org=organization['id'])
         app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id=dataset['name'])
-        app.get(
-            url,
+        response = app.get(
+            url_for(controller='package',
+                    action='edit',
+                    id=dataset['name']),
             status=403,
         )
 
-        app.post(
-            url,
+        response = app.post(
+            url_for(controller='package',
+                    action='edit',
+                    id=dataset['name']),
             {'notes': 'edited description'},
             status=403,
         )
@@ -566,13 +528,10 @@ def test_validation_errors_for_dataset_name_appear(self):
         dataset = factories.Dataset(owner_org=organization['id'])
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id=dataset['name'])
-
         response = app.get(
-            url,
+            url_for(controller='package',
+                    action='edit',
+                    id=dataset['name']),
             extra_environ=env,
         )
         form = response.forms['dataset-edit']
@@ -587,13 +546,10 @@ def test_edit_a_dataset_that_does_not_exist_404s(self):
         user = factories.User()
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='edit',
-                          id='does-not-exist')
-
         response = app.get(
-            url,
+            url_for(controller='package',
+                    action='edit',
+                    id='does-not-exist'),
             extra_environ=env,
             expect_errors=True
         )
@@ -604,11 +560,8 @@ class TestPackageRead(helpers.FunctionalTestBase):
     def test_read(self):
         dataset = factories.Dataset()
         app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read',
-                          id=dataset['name'])
-            response = app.get(url)
+        response = app.get(url_for(controller='package', action='read',
+                                   id=dataset['name']))
         response.mustcontain('Test Dataset')
         response.mustcontain('Just another test dataset')
 
@@ -632,13 +585,13 @@ def test_organization_members_can_read_private_datasets(self):
         )
         app = helpers._get_test_app()
 
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='read',
-                          id=dataset['name'])
         for user, user_dict in members.items():
             response = app.get(
-                url,
+                url_for(
+                    controller='package',
+                    action='read',
+                    id=dataset['name']
+                ),
                 extra_environ={
                     'REMOTE_USER': user_dict['name'].encode('ascii'),
                 },
@@ -653,13 +606,8 @@ def test_anonymous_users_cannot_read_private_datasets(self):
             private=True,
         )
         app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='read',
-                          id=dataset['name'])
-
         response = app.get(
-            url,
+            url_for(controller='package', action='read', id=dataset['name']),
             status=404
         )
         assert_equal(404, response.status_int)
@@ -672,13 +620,8 @@ def test_user_not_in_organization_cannot_read_private_datasets(self):
             private=True,
         )
         app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='read',
-                          id=dataset['name'])
-
         response = app.get(
-            url,
+            url_for(controller='package', action='read', id=dataset['name']),
             extra_environ={'REMOTE_USER': user['name'].encode('ascii')},
             status=404
         )
@@ -688,20 +631,18 @@ def test_read_rdf(self):
         ''' The RDF outputs now live in ckanext-dcat'''
         dataset1 = factories.Dataset()
 
+        offset = url_for(controller='package', action='read',
+                         id=dataset1['name']) + ".rdf"
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='read',
-                             id=dataset1['name']) + ".rdf"
         app.get(offset, status=404)
 
     def test_read_n3(self):
         ''' The RDF outputs now live in ckanext-dcat'''
         dataset1 = factories.Dataset()
 
+        offset = url_for(controller='package', action='read',
+                         id=dataset1['name']) + ".n3"
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='read',
-                             id=dataset1['name']) + ".n3"
         app.get(offset, status=404)
 
 
@@ -715,12 +656,8 @@ def test_owner_delete(self):
 
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='delete', id=dataset['name'])
-
         response = app.post(
-            url,
+            url_for(controller='package', action='delete', id=dataset['name']),
             extra_environ=env,
         )
         response = response.follow()
@@ -731,13 +668,9 @@ def test_owner_delete(self):
 
     def test_delete_on_non_existing_dataset(self):
         app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='delete',
-                    id='schrodingersdatset')
-
         response = app.post(
-            url,
+            url_for(controller='package', action='delete',
+                    id='schrodingersdatset'),
             expect_errors=True,
         )
         assert_equal(404, response.status_int)
@@ -750,11 +683,8 @@ def test_sysadmin_can_delete_any_dataset(self):
         user = factories.Sysadmin()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
 
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='delete', id=dataset['name'])
-
         response = app.post(
-            url,
+            url_for(controller='package', action='delete', id=dataset['name']),
             extra_environ=env,
         )
         response = response.follow()
@@ -771,12 +701,8 @@ def test_anon_user_cannot_delete_owned_dataset(self):
         dataset = factories.Dataset(owner_org=owner_org['id'])
 
         app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='delete', id=dataset['name'])
-
         response = app.post(
-            url,
+            url_for(controller='package', action='delete', id=dataset['name']),
             status=403,
         )
         response.mustcontain('Unauthorized to delete package')
@@ -794,12 +720,8 @@ def test_logged_in_user_cannot_delete_owned_dataset(self):
         app = helpers._get_test_app()
         user = factories.User()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='delete', id=dataset['name'])
-
         response = app.post(
-            url,
+            url_for(controller='package', action='delete', id=dataset['name']),
             extra_environ=env,
             expect_errors=True
         )
@@ -819,12 +741,8 @@ def test_confirm_cancel_delete(self):
 
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='delete', id=dataset['name'])
-
         response = app.get(
-            url,
+            url_for(controller='package', action='delete', id=dataset['name']),
             extra_environ=env,
         )
         assert_equal(200, response.status_int)
@@ -848,16 +766,12 @@ def test_manage_dataset_resource_listing_page(self):
         resource = factories.Resource(package_id=dataset['id'])
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.get(
+            url_for(
                 controller='package',
                 action='resources',
                 id=dataset['name'],
-            )
-
-        response = app.get(
-            url,
+            ),
             extra_environ=env
         )
         assert_in(resource['name'], response)
@@ -871,16 +785,12 @@ def test_unauth_user_cannot_view_manage_dataset_resource_listing_page(self):
         resource = factories.Resource(package_id=dataset['id'])
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.get(
+            url_for(
                 controller='package',
                 action='resources',
                 id=dataset['name'],
-            )
-
-        response = app.get(
-            url,
+            ),
             extra_environ=env
         )
         assert_in(resource['name'], response)
@@ -891,16 +801,12 @@ def test_404_on_manage_dataset_resource_listing_page_that_does_not_exist(self):
         user = factories.User()
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.get(
+            url_for(
                 controller='package',
                 action='resources',
                 id='does-not-exist'
-            )
-
-        response = app.get(
-            url,
+            ),
             extra_environ=env,
             expect_errors=True
         )
@@ -912,15 +818,12 @@ def test_add_new_resource_with_link_and_download(self):
         env = {'REMOTE_USER': user['name'].encode('ascii')}
         app = helpers._get_test_app()
 
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.get(
+            url_for(
                 controller='package',
                 action='new_resource',
                 id=dataset['id'],
-            )
-
-        response = app.get(
-            url,
+            ),
             extra_environ=env
         )
 
@@ -930,17 +833,13 @@ def test_add_new_resource_with_link_and_download(self):
                                      'go-dataset-complete')
 
         result = helpers.call_action('package_show', id=dataset['id'])
-
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.get(
+            url_for(
                 controller='package',
                 action='resource_download',
                 id=dataset['id'],
                 resource_id=result['resources'][0]['id']
-            )
-
-        response = app.get(
-            url,
+            ),
             extra_environ=env,
         )
         assert_equal(302, response.status_int)
@@ -956,15 +855,12 @@ def test_editor_can_add_new_resource(self):
         env = {'REMOTE_USER': user['name'].encode('ascii')}
         app = helpers._get_test_app()
 
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.get(
+            url_for(
                 controller='package',
                 action='new_resource',
                 id=dataset['id'],
-            )
-
-        response = app.get(
-            url,
+            ),
             extra_environ=env
         )
 
@@ -989,15 +885,12 @@ def test_admin_can_add_new_resource(self):
         env = {'REMOTE_USER': user['name'].encode('ascii')}
         app = helpers._get_test_app()
 
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.get(
+            url_for(
                 controller='package',
                 action='new_resource',
                 id=dataset['id'],
-            )
-
-        response = app.get(
-            url,
+            ),
             extra_environ=env
         )
 
@@ -1022,28 +915,22 @@ def test_member_cannot_add_new_resource(self):
         env = {'REMOTE_USER': user['name'].encode('ascii')}
         app = helpers._get_test_app()
 
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.get(
+            url_for(
                 controller='package',
                 action='new_resource',
                 id=dataset['id'],
-            )
-
-        response = app.get(
-            url,
+            ),
             extra_environ=env,
             status=403,
         )
 
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.post(
+            url_for(
                 controller='package',
                 action='new_resource',
                 id=dataset['id'],
-            )
-
-        response = app.post(
-            url,
+            ),
             {'name': 'test', 'url': 'test', 'save': 'save', 'id': ''},
             extra_environ=env,
             status=403,
@@ -1059,28 +946,22 @@ def test_non_organization_users_cannot_add_new_resource(self):
         env = {'REMOTE_USER': user['name'].encode('ascii')}
         app = helpers._get_test_app()
 
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.get(
+            url_for(
                 controller='package',
                 action='new_resource',
                 id=dataset['id'],
-            )
-
-        response = app.get(
-            url,
+            ),
             extra_environ=env,
             status=403,
         )
 
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.post(
+            url_for(
                 controller='package',
                 action='new_resource',
                 id=dataset['id'],
-            )
-
-        response = app.post(
-            url,
+            ),
             {'name': 'test', 'url': 'test', 'save': 'save', 'id': ''},
             extra_environ=env,
             status=403,
@@ -1093,27 +974,21 @@ def test_anonymous_users_cannot_add_new_resource(self):
         )
         app = helpers._get_test_app()
 
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.get(
+            url_for(
                 controller='package',
                 action='new_resource',
                 id=dataset['id'],
-            )
-
-        response = app.get(
-            url,
+            ),
             status=403,
         )
 
-        with app.flask_app.test_request_context():
-            url = url_for(
+        response = app.post(
+            url_for(
                 controller='package',
                 action='new_resource',
                 id=dataset['id'],
-            )
-
-        response = app.post(
-            url,
+            ),
             {'name': 'test', 'url': 'test', 'save': 'save', 'id': ''},
             status=403,
         )
@@ -1166,41 +1041,35 @@ def teardown_class(cls):
     def test_existent_resource_view_page_returns_ok_code(self):
         resource_view = factories.ResourceView()
 
-        app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='resource_read',
-                          id=resource_view['package_id'],
-                          resource_id=resource_view['resource_id'],
-                          view_id=resource_view['id'])
+        url = url_for(controller='package',
+                      action='resource_read',
+                      id=resource_view['package_id'],
+                      resource_id=resource_view['resource_id'],
+                      view_id=resource_view['id'])
 
+        app = self._get_test_app()
         app.get(url, status=200)
 
     def test_inexistent_resource_view_page_returns_not_found_code(self):
         resource_view = factories.ResourceView()
 
-        app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='resource_read',
-                          id=resource_view['package_id'],
-                          resource_id=resource_view['resource_id'],
-                          view_id='inexistent-view-id')
+        url = url_for(controller='package',
+                      action='resource_read',
+                      id=resource_view['package_id'],
+                      resource_id=resource_view['resource_id'],
+                      view_id='inexistent-view-id')
 
+        app = self._get_test_app()
         app.get(url, status=404)
 
     def test_resource_view_description_is_rendered_as_markdown(self):
         resource_view = factories.ResourceView(description="Some **Markdown**")
-
+        url = url_for(controller='package',
+                      action='resource_read',
+                      id=resource_view['package_id'],
+                      resource_id=resource_view['resource_id'],
+                      view_id=resource_view['id'])
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='resource_read',
-                          id=resource_view['package_id'],
-                          resource_id=resource_view['resource_id'],
-                          view_id=resource_view['id'])
         response = app.get(url)
         response.mustcontain('Some <strong>Markdown</strong>')
 
@@ -1211,12 +1080,12 @@ def test_existing_resource_with_not_associated_dataset(self):
         dataset = factories.Dataset()
         resource = factories.Resource()
 
+        url = url_for(controller='package',
+                      action='resource_read',
+                      id=dataset['id'],
+                      resource_id=resource['id'])
+
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='resource_read',
-                          id=dataset['id'],
-                          resource_id=resource['id'])
         app.get(url, status=404)
 
     def test_resource_read_logged_in_user(self):
@@ -1228,12 +1097,12 @@ def test_resource_read_logged_in_user(self):
         dataset = factories.Dataset()
         resource = factories.Resource(package_id=dataset['id'])
 
+        url = url_for(controller='package',
+                      action='resource_read',
+                      id=dataset['id'],
+                      resource_id=resource['id'])
+
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='resource_read',
-                          id=dataset['id'],
-                          resource_id=resource['id'])
         app.get(url, status=200, extra_environ=env)
 
     def test_resource_read_anon_user(self):
@@ -1243,12 +1112,12 @@ def test_resource_read_anon_user(self):
         dataset = factories.Dataset()
         resource = factories.Resource(package_id=dataset['id'])
 
+        url = url_for(controller='package',
+                      action='resource_read',
+                      id=dataset['id'],
+                      resource_id=resource['id'])
+
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='resource_read',
-                          id=dataset['id'],
-                          resource_id=resource['id'])
         app.get(url, status=200)
 
     def test_resource_read_sysadmin(self):
@@ -1260,12 +1129,12 @@ def test_resource_read_sysadmin(self):
         dataset = factories.Dataset()
         resource = factories.Resource(package_id=dataset['id'])
 
+        url = url_for(controller='package',
+                      action='resource_read',
+                      id=dataset['id'],
+                      resource_id=resource['id'])
+
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='resource_read',
-                          id=dataset['id'],
-                          resource_id=resource['id'])
         app.get(url, status=200, extra_environ=env)
 
     def test_user_not_in_organization_cannot_read_private_dataset(self):
@@ -1278,12 +1147,12 @@ def test_user_not_in_organization_cannot_read_private_dataset(self):
         )
         resource = factories.Resource(package_id=dataset['id'])
 
+        url = url_for(controller='package',
+                      action='resource_read',
+                      id=dataset['id'],
+                      resource_id=resource['id'])
+
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='resource_read',
-                          id=dataset['id'],
-                          resource_id=resource['id'])
         response = app.get(url,
                            status=404,
                            extra_environ=env)
@@ -1310,16 +1179,14 @@ def test_organization_members_can_read_resources_in_private_datasets(self):
 
         app = helpers._get_test_app()
 
-        with app.flask_app.test_request_context():
-            url = url_for(
-                controller='package',
-                action='resource_read',
-                id=dataset['name'],
-                resource_id=resource['id'],
-            )
         for user, user_dict in members.items():
             response = app.get(
-                url,
+                url_for(
+                    controller='package',
+                    action='resource_read',
+                    id=dataset['name'],
+                    resource_id=resource['id'],
+                ),
                 extra_environ={
                     'REMOTE_USER': user_dict['name'].encode('ascii'),
                 },
@@ -1333,12 +1200,8 @@ def test_anonymous_users_cannot_read_private_datasets(self):
             private=True,
         )
         app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='read', id=dataset['name'])
-
         response = app.get(
-            url,
+            url_for(controller='package', action='read', id=dataset['name']),
             status=404
         )
         assert_equal(404, response.status_int)
@@ -1354,13 +1217,9 @@ def test_dataset_owners_can_delete_resources(self):
         resource = factories.Resource(package_id=dataset['id'])
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='resource_delete',
-                          id=dataset['name'], resource_id=resource['id'])
-
         response = app.post(
-            url,
+            url_for(controller='package', action='resource_delete',
+                    id=dataset['name'], resource_id=resource['id']),
             extra_environ=env,
         )
         response = response.follow()
@@ -1378,13 +1237,9 @@ def test_deleting_non_existing_resource_404s(self):
         dataset = factories.Dataset(owner_org=owner_org['id'])
         env = {'REMOTE_USER': user['name'].encode('ascii')}
         app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='resource_delete',
-                          id=dataset['name'], resource_id='doesnotexist')
-
         response = app.post(
-            url,
+            url_for(controller='package', action='resource_delete',
+                    id=dataset['name'], resource_id='doesnotexist'),
             extra_environ=env,
             expect_errors=True
         )
@@ -1399,13 +1254,9 @@ def test_anon_users_cannot_delete_owned_resources(self):
         resource = factories.Resource(package_id=dataset['id'])
 
         app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='resource_delete',
-                          id=dataset['name'], resource_id=resource['id'])
-
         response = app.post(
-            url,
+            url_for(controller='package', action='resource_delete',
+                    id=dataset['name'], resource_id=resource['id']),
             status=403,
         )
         response.mustcontain('Unauthorized to delete package')
@@ -1423,13 +1274,9 @@ def test_logged_in_users_cannot_delete_resources_they_do_not_own(self):
         user = factories.User()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
         app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='resource_delete',
-                          id=dataset['name'], resource_id=resource['id'])
-
         response = app.post(
-            url,
+            url_for(controller='package', action='resource_delete',
+                    id=dataset['name'], resource_id=resource['id']),
             extra_environ=env,
             expect_errors=True
         )
@@ -1444,13 +1291,9 @@ def test_sysadmins_can_delete_any_resource(self):
         sysadmin = factories.Sysadmin()
         app = helpers._get_test_app()
         env = {'REMOTE_USER': sysadmin['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='resource_delete',
-                          id=dataset['name'], resource_id=resource['id'])
-
         response = app.post(
-            url,
+            url_for(controller='package', action='resource_delete',
+                    id=dataset['name'], resource_id=resource['id']),
             extra_environ=env,
         )
         response = response.follow()
@@ -1473,13 +1316,9 @@ def test_confirm_and_cancel_deleting_a_resource(self):
         resource = factories.Resource(package_id=dataset['id'])
         app = helpers._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='resource_delete',
-                          id=dataset['name'], resource_id=resource['id'])
-
         response = app.get(
-            url,
+            url_for(controller='package', action='resource_delete',
+                    id=dataset['name'], resource_id=resource['id']),
             extra_environ=env,
         )
         assert_equal(200, response.status_int)
@@ -1497,9 +1336,8 @@ class TestSearch(helpers.FunctionalTestBase):
     def test_search_basic(self):
         dataset1 = factories.Dataset()
 
+        offset = url_for(controller='package', action='search')
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='search')
         page = app.get(offset)
 
         assert dataset1['name'] in page.body.decode('utf8')
@@ -1520,10 +1358,8 @@ def test_search_sort_by_blank(self):
         factories.Dataset()
 
         # ?sort has caused an exception in the past
-
+        offset = url_for(controller='package', action='search') + '?sort'
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='search') + '?sort'
         app.get(offset)
 
     def test_search_sort_by_bad(self):
@@ -1532,11 +1368,9 @@ def test_search_sort_by_bad(self):
         # bad spiders try all sorts of invalid values for sort. They should get
         # a 400 error with specific error message. No need to alert the
         # administrator.
-
+        offset = url_for(controller='package', action='search') + \
+            '?sort=gvgyr_fgevat+nfp'
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='search') + \
-                '?sort=gvgyr_fgevat+nfp'
         response = app.get(offset, status=[200, 400])
         if response.status == 200:
             import sys
@@ -1552,10 +1386,9 @@ def test_search_solr_syntax_error(self):
         # Whilst this could be due to a bad user input, it could also be
         # because CKAN mangled things somehow and therefore we flag it up to
         # the administrator and give a meaningless error, just in case
+        offset = url_for(controller='package', action='search') + \
+            '?q=--included'
         app = self._get_test_app()
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='package', action='search') + \
-                '?q=--included'
         search_response = app.get(offset)
 
         search_response_html = BeautifulSoup(search_response.body)
@@ -1566,9 +1399,8 @@ def test_search_solr_syntax_error(self):
     def test_search_plugin_hooks(self):
         with p.use_plugin('test_package_controller_plugin') as plugin:
 
+            offset = url_for(controller='package', action='search')
             app = self._get_test_app()
-            with app.flask_app.test_request_context():
-                offset = url_for(controller='package', action='search')
             app.get(offset)
 
             # get redirected ...
@@ -1582,8 +1414,7 @@ def test_search_page_request(self):
         factories.Dataset(name="dataset-two", title='Dataset Two')
         factories.Dataset(name="dataset-three", title='Dataset Three')
 
-        with app.flask_app.test_request_context():
-            search_url = url_for(controller='package', action='search')
+        search_url = url_for(controller='package', action='search')
         search_response = app.get(search_url)
 
         assert_true('3 datasets found' in search_response)
@@ -1606,8 +1437,7 @@ def test_search_page_results(self):
         factories.Dataset(name="dataset-two", title='Dataset Two')
         factories.Dataset(name="dataset-three", title='Dataset Three')
 
-        with app.flask_app.test_request_context():
-            search_url = url_for(controller='package', action='search')
+        search_url = url_for(controller='package', action='search')
         search_response = app.get(search_url)
 
         search_form = search_response.forms['dataset-search-form']
@@ -1632,8 +1462,7 @@ def test_search_page_no_results(self):
         factories.Dataset(name="dataset-two", title='Dataset Two')
         factories.Dataset(name="dataset-three", title='Dataset Three')
 
-        with app.flask_app.test_request_context():
-            search_url = url_for(controller='package', action='search')
+        search_url = url_for(controller='package', action='search')
         search_response = app.get(search_url)
 
         search_form = search_response.forms['dataset-search-form']
@@ -1658,8 +1487,7 @@ def test_search_page_results_tag(self):
         factories.Dataset(name="dataset-two", title='Dataset Two')
         factories.Dataset(name="dataset-three", title='Dataset Three')
 
-        with app.flask_app.test_request_context():
-            search_url = url_for(controller='package', action='search')
+        search_url = url_for(controller='package', action='search')
         search_response = app.get(search_url)
 
         assert_true('/dataset?tags=my-tag' in search_response)
@@ -1687,8 +1515,7 @@ def test_search_page_results_private(self):
         factories.Dataset(name="dataset-two", title='Dataset Two')
         factories.Dataset(name="dataset-three", title='Dataset Three')
 
-        with app.flask_app.test_request_context():
-            search_url = url_for(controller='package', action='search')
+        search_url = url_for(controller='package', action='search')
         search_response = app.get(search_url)
 
         search_response_html = BeautifulSoup(search_response.body)
@@ -1711,9 +1538,7 @@ def test_user_not_in_organization_cannot_search_private_datasets(self):
             private=True,
         )
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            search_url = url_for(controller='package', action='search')
+        search_url = url_for(controller='package', action='search')
         search_response = app.get(search_url, extra_environ=env)
 
         search_response_html = BeautifulSoup(search_response.body)
@@ -1733,9 +1558,7 @@ def test_user_in_organization_can_search_private_datasets(self):
             private=True,
         )
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            search_url = url_for(controller='package', action='search')
+        search_url = url_for(controller='package', action='search')
         search_response = app.get(search_url, extra_environ=env)
 
         search_response_html = BeautifulSoup(search_response.body)
@@ -1756,9 +1579,7 @@ def test_user_in_different_organization_cannot_search_private_datasets(self):
             private=True,
         )
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            search_url = url_for(controller='package', action='search')
+        search_url = url_for(controller='package', action='search')
         search_response = app.get(search_url, extra_environ=env)
 
         search_response_html = BeautifulSoup(search_response.body)
@@ -1778,9 +1599,7 @@ def test_search_default_include_private_false(self):
             private=True,
         )
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            search_url = url_for(controller='package', action='search')
+        search_url = url_for(controller='package', action='search')
         search_response = app.get(search_url, extra_environ=env)
 
         search_response_html = BeautifulSoup(search_response.body)
@@ -1799,9 +1618,7 @@ def test_sysadmin_can_search_private_datasets(self):
             private=True,
         )
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            search_url = url_for(controller='package', action='search')
+        search_url = url_for(controller='package', action='search')
         search_response = app.get(search_url, extra_environ=env)
 
         search_response_html = BeautifulSoup(search_response.body)
@@ -1820,11 +1637,9 @@ def test_package_follow(self):
         package = factories.Dataset()
 
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='package',
-                                 action='follow',
-                                 id=package['id'])
+        follow_url = url_for(controller='package',
+                             action='follow',
+                             id=package['id'])
         response = app.post(follow_url, extra_environ=env, status=302)
         response = response.follow()
         assert_true('You are now following {0}'
@@ -1838,11 +1653,9 @@ def test_package_follow_not_exist(self):
         user_one = factories.User()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='package',
-                                 action='follow',
-                                 id='not-here')
+        follow_url = url_for(controller='package',
+                             action='follow',
+                             id='not-here')
         response = app.post(follow_url, extra_environ=env, status=302)
         response = response.follow(status=404)
         assert_true('Dataset not found' in response)
@@ -1854,16 +1667,13 @@ def test_package_unfollow(self):
         package = factories.Dataset()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='package',
-                                action='follow',
-                                 id=package['id'])
+        follow_url = url_for(controller='package',
+                             action='follow',
+                             id=package['id'])
         app.post(follow_url, extra_environ=env, status=302)
 
-        with app.flask_app.test_request_context():
-            unfollow_url = url_for(controller='package', action='unfollow',
-                                   id=package['id'])
+        unfollow_url = url_for(controller='package', action='unfollow',
+                               id=package['id'])
         unfollow_response = app.post(unfollow_url, extra_environ=env,
                                      status=302)
         unfollow_response = unfollow_response.follow()
@@ -1880,10 +1690,8 @@ def test_package_unfollow_not_following(self):
         package = factories.Dataset()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            unfollow_url = url_for(controller='package', action='unfollow',
-                                   id=package['id'])
+        unfollow_url = url_for(controller='package', action='unfollow',
+                               id=package['id'])
         unfollow_response = app.post(unfollow_url, extra_environ=env,
                                      status=302)
         unfollow_response = unfollow_response.follow()
@@ -1898,10 +1706,8 @@ def test_package_unfollow_not_exist(self):
         user_one = factories.User()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            unfollow_url = url_for(controller='package', action='unfollow',
-                                   id='not-here')
+        unfollow_url = url_for(controller='package', action='unfollow',
+                               id='not-here')
         unfollow_response = app.post(unfollow_url, extra_environ=env,
                                      status=302)
         unfollow_response = unfollow_response.follow(status=404)
@@ -1915,17 +1721,14 @@ def test_package_follower_list(self):
         package = factories.Dataset()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='package',
-                                 action='follow',
-                                 id=package['id'])
-
-            followers_url = url_for(controller='package', action='followers',
-                                    id=package['id'])
-
+        follow_url = url_for(controller='package',
+                             action='follow',
+                             id=package['id'])
         app.post(follow_url, extra_environ=env, status=302)
 
+        followers_url = url_for(controller='package', action='followers',
+                                id=package['id'])
+
         # Only sysadmins can view the followers list pages
         followers_response = app.get(followers_url, extra_environ=env,
                                      status=200)
@@ -1939,9 +1742,8 @@ def test_dataset_read(self):
 
         dataset = factories.Dataset()
 
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package',
-                          action='read',
-                          id=dataset['id'])
+        url = url_for(controller='package',
+                      action='read',
+                      id=dataset['id'])
         response = app.get(url)
         assert_in(dataset['title'], response)
diff --git a/ckan/tests/controllers/test_tags.py b/ckan/tests/controllers/test_tags.py
index 3c34445e911..46b4b255b6f 100644
--- a/ckan/tests/controllers/test_tags.py
+++ b/ckan/tests/controllers/test_tags.py
@@ -6,7 +6,7 @@
 from nose.tools import assert_equal, assert_true, assert_false, assert_in
 from bs4 import BeautifulSoup
 
-from ckan.lib.helpers import url_for
+from routes import url_for
 
 import ckan.tests.helpers as helpers
 from ckan.tests import factories
@@ -32,8 +32,7 @@ def test_tags_listed_under_50(self):
         expected_tags = _make_tag_list(49)
         factories.Dataset(tags=expected_tags)
 
-        with app.flask_app.test_request_context():
-            tag_index_url = url_for(controller='tag', action='index')
+        tag_index_url = url_for(controller='tag', action='index')
         tag_response = app.get(tag_index_url)
 
         tag_response_html = BeautifulSoup(tag_response.body)
@@ -54,8 +53,7 @@ def test_tags_listed_over_50(self):
         expected_tags = _make_tag_list(51)
         factories.Dataset(tags=expected_tags)
 
-        with app.flask_app.test_request_context():
-            tag_index_url = url_for(controller='tag', action='index')
+        tag_index_url = url_for(controller='tag', action='index')
         tag_response = app.get(tag_index_url)
 
         tag_response_html = BeautifulSoup(tag_response.body)
@@ -78,8 +76,7 @@ def test_tag_search(self):
         expected_tags.append({'name': 'find-me'})
         factories.Dataset(tags=expected_tags)
 
-        with app.flask_app.test_request_context():
-            tag_index_url = url_for(controller='tag', action='index')
+        tag_index_url = url_for(controller='tag', action='index')
         tag_response = app.get(tag_index_url)
 
         search_form = tag_response.forms[1]
@@ -101,8 +98,7 @@ def test_tag_search_no_results(self):
         expected_tags = _make_tag_list(50)
         factories.Dataset(tags=expected_tags)
 
-        with app.flask_app.test_request_context():
-            tag_index_url = url_for(controller='tag', action='index')
+        tag_index_url = url_for(controller='tag', action='index')
         tag_response = app.get(tag_index_url)
 
         search_form = tag_response.forms[1]
@@ -125,8 +121,7 @@ def test_tag_read_redirects_to_dataset_search(self):
         app = self._get_test_app()
         factories.Dataset(title='My Other Dataset', tags=[{'name': 'find-me'}])
 
-        with app.flask_app.test_request_context():
-            tag_url = url_for(controller='tag', action='read', id='find-me')
+        tag_url = url_for(controller='tag', action='read', id='find-me')
         tag_response = app.get(tag_url, status=302)
         assert_equal(tag_response.headers['Location'],
                      'http://test.ckan.net/dataset?tags=find-me')
@@ -136,6 +131,5 @@ def test_tag_read_not_found(self):
         app = self._get_test_app()
         factories.Dataset(title='My Other Dataset', tags=[{'name': 'find-me'}])
 
-        with app.flask_app.test_request_context():
-            tag_url = url_for(controller='tag', action='read', id='not-here')
+        tag_url = url_for(controller='tag', action='read', id='not-here')
         app.get(tag_url, status=404)
diff --git a/ckan/tests/controllers/test_user.py b/ckan/tests/controllers/test_user.py
index d3dbd12426c..be352bca2e9 100644
--- a/ckan/tests/controllers/test_user.py
+++ b/ckan/tests/controllers/test_user.py
@@ -1,12 +1,14 @@
 # encoding: utf-8
+from bs4 import BeautifulSoup
+from nose.tools import assert_true, assert_false, assert_equal, assert_in
 
-from ckan.lib.helpers import url_for
+import ckan.tests.helpers as helpers
 import ckan.tests.factories as factories
 import ckan.tests.helpers as helpers
-from bs4 import BeautifulSoup
+
+from ckan.lib.helpers import url_for
 from ckan import model
 from ckan.lib.mailer import create_reset_key
-from nose.tools import assert_true, assert_false, assert_equal, assert_in
 
 webtest_submit = helpers.webtest_submit
 submit_and_follow = helpers.submit_and_follow
@@ -15,11 +17,8 @@
 def _get_user_edit_page(app):
     user = factories.User()
     env = {'REMOTE_USER': user['name'].encode('ascii')}
-    with app.flask_app.test_request_context():
-        url = url_for(controller='user', action='edit')
-
     response = app.get(
-        url=url,
+        url=url_for(controller='user', action='edit'),
         extra_environ=env,
     )
     return env, response, user
@@ -28,11 +27,7 @@ def _get_user_edit_page(app):
 class TestRegisterUser(helpers.FunctionalTestBase):
     def test_register_a_user(self):
         app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='register')
-
-        response = app.get(url)
+        response = app.get(url=url_for(controller='user', action='register'))
 
         form = response.forms['user-register-form']
         form['name'] = 'newuser'
@@ -51,11 +46,7 @@ def test_register_a_user(self):
 
     def test_register_user_bad_password(self):
         app = helpers._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='register')
-
-        response = app.get(url)
+        response = app.get(url=url_for(controller='user', action='register'))
 
         form = response.forms['user-register-form']
         form['name'] = 'newuser'
@@ -85,10 +76,9 @@ def test_create_user_as_sysadmin(self):
         # submit it
         login_form.submit('save')
 
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='register')
-        response = app.get(url)
-
+        response = app.get(
+            url=url_for(controller='user', action='register'),
+        )
         assert "user-register-form" in response.forms
         form = response.forms['user-register-form']
         form['name'] = 'newestuser'
@@ -175,8 +165,7 @@ def test_user_logout_url_redirect(self):
         '''
         app = self._get_test_app()
 
-        with app.flask_app.test_request_context():
-            logout_url = url_for(controller='user', action='logout')
+        logout_url = url_for(controller='user', action='logout')
         logout_response = app.get(logout_url, status=302)
         final_response = helpers.webtest_maybe_follow(logout_response)
 
@@ -193,10 +182,7 @@ def test_non_root_user_logout_url_redirect(self):
         '''
         app = self._get_test_app()
 
-        with app.flask_app.test_request_context():
-            logout_url = url_for(controller='user', action='logout')
-        # Remove the prefix otherwise the test app won't find the correct route
-        logout_url = logout_url.replace('/my/prefix', '')
+        logout_url = url_for(controller='user', action='logout')
         logout_response = app.get(logout_url, status=302)
         assert_equal(logout_response.status_int, 302)
         assert_true('/my/prefix/user/logout' in logout_response.location)
@@ -213,12 +199,8 @@ def test_own_datasets_show_up_on_user_dashboard(self):
 
         app = self._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='dashboard_datasets')
-
         response = app.get(
-            url,
+            url=url_for(controller='user', action='dashboard_datasets'),
             extra_environ=env,
         )
 
@@ -234,12 +216,8 @@ def test_other_datasets_dont_show_up_on_user_dashboard(self):
 
         app = self._get_test_app()
         env = {'REMOTE_USER': user2['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='dashboard_datasets')
-
         response = app.get(
-            url,
+            url=url_for(controller='user', action='dashboard_datasets'),
             extra_environ=env,
         )
 
@@ -250,12 +228,8 @@ class TestUserEdit(helpers.FunctionalTestBase):
 
     def test_user_edit_no_user(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='edit', id=None)
-
         response = app.get(
-            url,
+            url_for(controller='user', action='edit', id=None),
             status=400
         )
         assert_true('No user specified' in response)
@@ -264,12 +238,8 @@ def test_user_edit_unknown_user(self):
         '''Attempt to read edit user for an unknown user redirects to login
         page.'''
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='edit', id='unknown_person')
-
         response = app.get(
-            url,
+            url_for(controller='user', action='edit', id='unknown_person'),
             status=403
         )
 
@@ -279,12 +249,8 @@ def test_user_edit_not_logged_in(self):
         app = self._get_test_app()
         user = factories.User()
         username = user['name']
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='edit', id=username)
-
         response = app.get(
-            url,
+            url_for(controller='user', action='edit', id=username),
             status=403
         )
 
@@ -292,12 +258,8 @@ def test_edit_user(self):
         user = factories.User(password='TestPassword1')
         app = self._get_test_app()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='edit')
-
         response = app.get(
-            url,
+            url=url_for(controller='user', action='edit'),
             extra_environ=env,
         )
         # existing values in the form
@@ -377,12 +339,8 @@ def test_edit_user_logged_in_username_change(self):
         login_form.submit()
 
         # Now the cookie is set, run the test
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='edit')
-
         response = app.get(
-            url,
+            url=url_for(controller='user', action='edit'),
         )
         # existing values in the form
         form = response.forms['user-edit-form']
@@ -410,12 +368,8 @@ def test_edit_user_logged_in_username_change_by_name(self):
         login_form.submit()
 
         # Now the cookie is set, run the test
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='edit', id=user['name'])
-
         response = app.get(
-            url,
+            url=url_for(controller='user', action='edit', id=user['name']),
         )
         # existing values in the form
         form = response.forms['user-edit-form']
@@ -443,12 +397,8 @@ def test_edit_user_logged_in_username_change_by_id(self):
         login_form.submit()
 
         # Now the cookie is set, run the test
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='user', action='edit', id=user['id'])
-
         response = app.get(
-            url,
+            url=url_for(controller='user', action='edit', id=user['id']),
         )
         # existing values in the form
         form = response.forms['user-edit-form']
@@ -468,12 +418,10 @@ def test_perform_reset_for_key_change(self):
         key = user_obj.reset_key
 
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            offset = url_for(controller='user',
-                             action='perform_reset',
-                             id=user_obj.id,
-                             key=user_obj.reset_key)
+        offset = url_for(controller='user',
+                         action='perform_reset',
+                         id=user_obj.id,
+                         key=user_obj.reset_key)
         response = app.post(offset, params=params, status=302)
         user_obj = helpers.model.User.by_name(user['name'])  # Update user_obj
 
@@ -524,10 +472,9 @@ def test_user_follow(self):
         user_two = factories.User()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='user',
-                                 action='follow',
-                                 id=user_two['id'])
+        follow_url = url_for(controller='user',
+                             action='follow',
+                             id=user_two['id'])
         response = app.post(follow_url, extra_environ=env, status=302)
         response = response.follow()
         assert_true('You are now following {0}'
@@ -541,10 +488,9 @@ def test_user_follow_not_exist(self):
         user_one = factories.User()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='user',
-                                 action='follow',
-                                 id='not-here')
+        follow_url = url_for(controller='user',
+                             action='follow',
+                             id='not-here')
         response = app.post(follow_url, extra_environ=env, status=302)
         response = response.follow(status=302)
         assert_in('user/login', response.headers['location'])
@@ -556,15 +502,13 @@ def test_user_unfollow(self):
         user_two = factories.User()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='user',
-                                 action='follow',
-                                 id=user_two['id'])
+        follow_url = url_for(controller='user',
+                             action='follow',
+                             id=user_two['id'])
         app.post(follow_url, extra_environ=env, status=302)
 
-        with app.flask_app.test_request_context():
-            unfollow_url = url_for(controller='user', action='unfollow',
-                                   id=user_two['id'])
+        unfollow_url = url_for(controller='user', action='unfollow',
+                               id=user_two['id'])
         unfollow_response = app.post(unfollow_url, extra_environ=env,
                                      status=302)
         unfollow_response = unfollow_response.follow()
@@ -581,9 +525,8 @@ def test_user_unfollow_not_following(self):
         user_two = factories.User()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            unfollow_url = url_for(controller='user', action='unfollow',
-                                   id=user_two['id'])
+        unfollow_url = url_for(controller='user', action='unfollow',
+                               id=user_two['id'])
         unfollow_response = app.post(unfollow_url, extra_environ=env,
                                      status=302)
         unfollow_response = unfollow_response.follow()
@@ -598,9 +541,8 @@ def test_user_unfollow_not_exist(self):
         user_one = factories.User()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            unfollow_url = url_for(controller='user', action='unfollow',
-                                   id='not-here')
+        unfollow_url = url_for(controller='user', action='unfollow',
+                               id='not-here')
         unfollow_response = app.post(unfollow_url, extra_environ=env,
                                      status=302)
         unfollow_response = unfollow_response.follow(status=302)
@@ -614,15 +556,13 @@ def test_user_follower_list(self):
         user_two = factories.User()
 
         env = {'REMOTE_USER': user_one['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            follow_url = url_for(controller='user',
-                                 action='follow',
-                                 id=user_two['id'])
+        follow_url = url_for(controller='user',
+                             action='follow',
+                             id=user_two['id'])
         app.post(follow_url, extra_environ=env, status=302)
 
-        with app.flask_app.test_request_context():
-            followers_url = url_for(controller='user', action='followers',
-                                    id=user_two['id'])
+        followers_url = url_for(controller='user', action='followers',
+                                id=user_two['id'])
 
         # Only sysadmins can view the followers list pages
         followers_response = app.get(followers_url, extra_environ=env,
@@ -636,8 +576,7 @@ def test_user_page_anon_access(self):
         '''Anon users can access the user list page'''
         app = self._get_test_app()
 
-        with app.flask_app.test_request_context():
-            user_url = url_for(controller='user', action='index')
+        user_url = url_for(controller='user', action='index')
         user_response = app.get(user_url, status=200)
         assert_true('<title>All Users - CKAN</title>'
                     in user_response)
@@ -649,8 +588,7 @@ def test_user_page_lists_users(self):
         factories.User(fullname='User Two')
         factories.User(fullname='User Three')
 
-        with app.flask_app.test_request_context():
-            user_url = url_for(controller='user', action='index')
+        user_url = url_for(controller='user', action='index')
         user_response = app.get(user_url, status=200)
 
         user_response_html = BeautifulSoup(user_response.body)
@@ -669,8 +607,7 @@ def test_user_page_doesnot_list_deleted_users(self):
         factories.User(fullname='User Two')
         factories.User(fullname='User Three')
 
-        with app.flask_app.test_request_context():
-            user_url = url_for(controller='user', action='index')
+        user_url = url_for(controller='user', action='index')
         user_response = app.get(user_url, status=200)
 
         user_response_html = BeautifulSoup(user_response.body)
@@ -689,8 +626,7 @@ def test_user_page_anon_search(self):
         factories.User(fullname='Person Two')
         factories.User(fullname='Person Three')
 
-        with app.flask_app.test_request_context():
-            user_url = url_for(controller='user', action='index')
+        user_url = url_for(controller='user', action='index')
         user_response = app.get(user_url, status=200)
         search_form = user_response.forms['user-search-form']
         search_form['q'] = 'Person'
@@ -712,8 +648,7 @@ def test_user_page_anon_search_not_by_email(self):
         factories.User(fullname='Person Two')
         factories.User(fullname='Person Three')
 
-        with app.flask_app.test_request_context():
-            user_url = url_for(controller='user', action='index')
+        user_url = url_for(controller='user', action='index')
         user_response = app.get(user_url, status=200)
         search_form = user_response.forms['user-search-form']
         search_form['q'] = 'useroneemail@example.com'
@@ -733,8 +668,7 @@ def test_user_page_sysadmin_user(self):
         factories.User(fullname='Person Three')
 
         env = {'REMOTE_USER': sysadmin['name'].encode('ascii')}
-        with app.flask_app.test_request_context():
-            user_url = url_for(controller='user', action='index')
+        user_url = url_for(controller='user', action='index')
         user_response = app.get(user_url, status=200, extra_environ=env)
         search_form = user_response.forms['user-search-form']
         search_form['q'] = 'useroneemail@example.com'
diff --git a/ckan/tests/controllers/test_util.py b/ckan/tests/controllers/test_util.py
index 45616b60d67..db76196e677 100644
--- a/ckan/tests/controllers/test_util.py
+++ b/ckan/tests/controllers/test_util.py
@@ -1,8 +1,10 @@
 # encoding: utf-8
 
 from nose.tools import assert_equal
+from pylons.test import pylonsapp
+import paste.fixture
 
-from ckan.lib.helpers import url_for
+from routes import url_for as url_for
 
 import ckan.tests.helpers as helpers
 
@@ -10,12 +12,8 @@
 class TestUtil(helpers.FunctionalTestBase):
     def test_redirect_ok(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='util', action='redirect')
-
         response = app.get(
-            url,
+            url=url_for(controller='util', action='redirect'),
             params={'url': '/dataset'},
             status=302,
         )
@@ -24,36 +22,24 @@ def test_redirect_ok(self):
 
     def test_redirect_external(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='util', action='redirect')
-
         response = app.get(
-            url,
+            url=url_for(controller='util', action='redirect'),
             params={'url': 'http://nastysite.com'},
             status=403,
         )
 
     def test_redirect_no_params(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='util', action='redirect')
-
         response = app.get(
-            url,
+            url=url_for(controller='util', action='redirect'),
             params={},
             status=400,
         )
 
     def test_redirect_no_params_2(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = url_for(controller='util', action='redirect')
-
         response = app.get(
-            url,
+            url=url_for(controller='util', action='redirect'),
             params={'url': ''},
             status=400,
         )
diff --git a/ckan/tests/lib/test_helpers.py b/ckan/tests/lib/test_helpers.py
index 9ce8740d5b3..1776f366e46 100644
--- a/ckan/tests/lib/test_helpers.py
+++ b/ckan/tests/lib/test_helpers.py
@@ -204,6 +204,7 @@ def test_url_for_qualified_with_root_path_locale_and_script_name_env(self):
         eq_(generated_url, url)
 
 
+
 class TestHelpersUrlForFlaskandPylons2(BaseUrlFor):
 
     def test_url_for_flask_route_new_syntax(self):
diff --git a/ckan/tests/lib/test_mailer.py b/ckan/tests/lib/test_mailer.py
index 8f467e7bf72..2ea839371cb 100644
--- a/ckan/tests/lib/test_mailer.py
+++ b/ckan/tests/lib/test_mailer.py
@@ -37,9 +37,6 @@ def setup_class(cls):
         model.Session.commit()
         SmtpServerHarness.setup_class()
 
-        # Used to provide a context for url_for
-        cls.app = helpers._get_test_app()
-
     @classmethod
     def teardown_class(cls):
         SmtpServerHarness.teardown_class()
@@ -48,13 +45,6 @@ def teardown_class(cls):
     def setup(self):
         self.clear_smtp_messages()
 
-        self.request_context = self.app.flask_app.test_request_context()
-        self.request_context.push()
-
-    def teardown(self):
-
-        self.request_context.pop()
-
     def mime_encode(self, msg, recipient_name):
         text = MIMEText(msg.encode('utf-8'), 'plain', 'utf-8')
         encoded_body = text.get_payload().strip()
@@ -164,9 +154,7 @@ def test_send_reset_email(self):
         user = factories.User()
         user_obj = model.User.by_name(user['name'])
 
-        # We need to provide a context as url_for is used internally
-        with self.app.flask_app.test_request_context():
-            mailer.send_reset_link(user_obj)
+        mailer.send_reset_link(user_obj)
 
         # check it went to the mock smtp server
         msgs = self.get_smtp_messages()
@@ -175,9 +163,7 @@ def test_send_reset_email(self):
         assert_equal(msg[1], config['smtp.mail_from'])
         assert_equal(msg[2], [user['email']])
         assert 'Reset' in msg[3], msg[3]
-        # We need to provide a context as url_for is used internally
-        with self.app.flask_app.test_request_context():
-            test_msg = mailer.get_reset_link_body(user_obj)
+        test_msg = mailer.get_reset_link_body(user_obj)
         expected_body = self.mime_encode(test_msg,
                                          user['name'])
 
@@ -188,12 +174,8 @@ def test_send_invite_email(self):
         user_obj = model.User.by_name(user['name'])
         assert user_obj.reset_key is None, user_obj
 
-        # We need to provide a context as url_for is used internally
-        with self.app.flask_app.test_request_context():
-            # send email
-            mailer.send_invite(user_obj)
-
-            test_msg = mailer.get_invite_body(user_obj)
+        # send email
+        mailer.send_invite(user_obj)
 
         # check it went to the mock smtp server
         msgs = self.get_smtp_messages()
@@ -201,6 +183,7 @@ def test_send_invite_email(self):
         msg = msgs[0]
         assert_equal(msg[1], config['smtp.mail_from'])
         assert_equal(msg[2], [user['email']])
+        test_msg = mailer.get_invite_body(user_obj)
         expected_body = self.mime_encode(test_msg,
                                          user['name'])
 
@@ -214,10 +197,8 @@ def test_send_invite_email_with_group(self):
         group = factories.Group()
         role = 'member'
 
-        # We need to provide a context as url_for is used internally
-        with self.app.flask_app.test_request_context():
-            # send email
-            mailer.send_invite(user_obj, group_dict=group, role=role)
+        # send email
+        mailer.send_invite(user_obj, group_dict=group, role=role)
 
         # check it went to the mock smtp server
         msgs = self.get_smtp_messages()
@@ -233,10 +214,8 @@ def test_send_invite_email_with_org(self):
         org = factories.Organization()
         role = 'admin'
 
-        # We need to provide a context as url_for is used internally
-        with self.app.flask_app.test_request_context():
-            # send email
-            mailer.send_invite(user_obj, group_dict=org, role=role)
+        # send email
+        mailer.send_invite(user_obj, group_dict=org, role=role)
 
         # check it went to the mock smtp server
         msgs = self.get_smtp_messages()
diff --git a/ckan/tests/logic/action/test_create.py b/ckan/tests/logic/action/test_create.py
index aef1ae5b1bc..84b691e9c0c 100644
--- a/ckan/tests/logic/action/test_create.py
+++ b/ckan/tests/logic/action/test_create.py
@@ -131,10 +131,8 @@ def test_smtp_error_returns_error_message(self):
             'role': 'editor'
         }
 
-        app = helpers._get_test_app()
-        with app.flask_app.test_request_context():
-            assert_raises(logic.ValidationError, helpers.call_action,
-                          'user_invite', context, **params)
+        assert_raises(logic.ValidationError, helpers.call_action,
+                      'user_invite', context, **params)
 
         # Check that the pending user was deleted
         user = model.Session.query(model.User).filter(

From c38c7dde2272de535fcb8682472388c03ef68163 Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Wed, 23 Aug 2017 12:41:13 +0100
Subject: [PATCH 4/5] Revert "[#3196] Fix ckanext tests dependant on url_for"

This reverts commit 22cb37d62841771481d1567323a7b0d6ea1949e9.
---
 ckanext/datapusher/tests/test.py              | 17 ++--
 ckanext/datapusher/tests/test_interfaces.py   | 21 +++--
 ckanext/datastore/tests/test_create.py        | 29 ++-----
 ckanext/datastore/tests/test_delete.py        | 18 ++---
 ckanext/datastore/tests/test_dump.py          |  9 +--
 ckanext/datastore/tests/test_search.py        | 10 ++-
 ckanext/datastore/tests/test_upsert.py        | 64 ++++++++-------
 .../tests/test_controllers.py                 |  4 +-
 .../tests/test_controllers.py                 | 59 +++++---------
 .../tests/test_example_iresourcecontroller.py |  6 +-
 .../example_itranslation/tests/test_plugin.py | 54 +++++--------
 ckanext/example_iuploader/test/test_plugin.py |  2 +-
 ckanext/imageview/tests/test_view.py          |  6 +-
 .../tests/test_multilingual_plugin.py         | 79 ++++++++-----------
 ckanext/reclineview/tests/test_view.py        | 37 ++++-----
 ckanext/resourceproxy/tests/test_proxy.py     | 31 +++-----
 ckanext/stats/tests/__init__.py               |  7 +-
 ckanext/stats/tests/test_stats_plugin.py      |  2 +
 ckanext/textview/tests/test_view.py           |  4 -
 ckanext/webpageview/tests/test_view.py        |  2 +-
 20 files changed, 184 insertions(+), 277 deletions(-)

diff --git a/ckanext/datapusher/tests/test.py b/ckanext/datapusher/tests/test.py
index 2b07c6e6925..28f8636009e 100644
--- a/ckanext/datapusher/tests/test.py
+++ b/ckanext/datapusher/tests/test.py
@@ -52,7 +52,7 @@ def __getattr__(self, attr):
 httpretty.core.fakesock.socket = HTTPrettyFix
 
 
-class TestDatastoreCreate(tests.WsgiAppCase):
+class TestDatastoreCreate():
     sysadmin_user = None
     normal_user = None
 
@@ -68,10 +68,8 @@ def setup_class(cls):
         cls.normal_user = model.User.get('annafan')
         engine = db.get_write_engine()
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))
-
-        with cls.app.flask_app.test_request_context():
-            set_url_type(
-                model.Package.get('annakarenina').resources, cls.sysadmin_user)
+        set_url_type(
+            model.Package.get('annakarenina').resources, cls.sysadmin_user)
 
     @classmethod
     def teardown_class(cls):
@@ -175,12 +173,9 @@ def test_send_datapusher_creates_task(self):
             'user': self.sysadmin_user.name
         }
 
-        # datapusher_submit will call a function further down the line that
-        # relies on url_for so we need a request context
-        with self.app.flask_app.test_request_context():
-            p.toolkit.get_action('datapusher_submit')(context, {
-                'resource_id': resource.id
-            })
+        p.toolkit.get_action('datapusher_submit')(context, {
+            'resource_id': resource.id
+        })
 
         context.pop('task_status', None)
 
diff --git a/ckanext/datapusher/tests/test_interfaces.py b/ckanext/datapusher/tests/test_interfaces.py
index 355d448804a..afb7007c57c 100644
--- a/ckanext/datapusher/tests/test_interfaces.py
+++ b/ckanext/datapusher/tests/test_interfaces.py
@@ -9,6 +9,7 @@
 from nose.tools import raises
 from ckan.common import config
 import sqlalchemy.orm as orm
+from ckan.tests.helpers import _get_test_app
 
 from ckan.tests import helpers, factories
 import ckan.plugins as p
@@ -29,7 +30,7 @@ class FakeDataPusherPlugin(p.SingletonPlugin):
     p.implements(p.IConfigurable, inherit=True)
     p.implements(interfaces.IDataPusher, inherit=True)
 
-    def configure(self, config):
+    def configure(self, _config):
         self.after_upload_calls = 0
 
     def can_upload(self, resource_id):
@@ -39,22 +40,21 @@ def after_upload(self, context, resource_dict, package_dict):
         self.after_upload_calls += 1
 
 
-class TestInterface(object):
+class TestInterace(object):
     sysadmin_user = None
     normal_user = None
 
     @classmethod
     def setup_class(cls):
-        cls.app = helpers._get_test_app()
+        cls.app = _get_test_app()
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
         p.load('datapusher')
         p.load('test_datapusher_plugin')
 
-        with cls.app.flask_app.test_request_context():
-            resource = factories.Resource(url_type='datastore')
-            cls.dataset = factories.Dataset(resources=[resource])
+        resource = factories.Resource(url_type='datastore')
+        cls.dataset = factories.Dataset(resources=[resource])
 
         cls.sysadmin_user = factories.User(name='testsysadmin', sysadmin=True)
         cls.normal_user = factories.User(name='annafan')
@@ -85,12 +85,9 @@ def test_send_datapusher_creates_task(self):
             'user': self.sysadmin_user['name']
         }
 
-        # datapusher_submit will call a function further down the line that
-        # relies on url_for so we need a request context
-        with self.app.flask_app.test_request_context():
-            result = p.toolkit.get_action('datapusher_submit')(context, {
-                'resource_id': resource['id']
-            })
+        result = p.toolkit.get_action('datapusher_submit')(context, {
+            'resource_id': resource['id']
+        })
         assert not result
 
         context.pop('task_status', None)
diff --git a/ckanext/datastore/tests/test_create.py b/ckanext/datastore/tests/test_create.py
index c772e5e5f45..a4b626082a8 100644
--- a/ckanext/datastore/tests/test_create.py
+++ b/ckanext/datastore/tests/test_create.py
@@ -5,6 +5,7 @@
 from nose.tools import assert_equal, raises
 
 import sqlalchemy.orm as orm
+from ckan.tests.helpers import _get_test_app
 
 from ckan.common import config
 import ckan.plugins as p
@@ -23,7 +24,6 @@
 class TestDatastoreCreateNewTests(object):
     @classmethod
     def setup_class(cls):
-        cls.app = helpers._get_test_app()
         p.load('datastore')
 
     @classmethod
@@ -31,15 +31,6 @@ def teardown_class(cls):
         p.unload('datastore')
         helpers.reset_db()
 
-    def setup(self):
-
-        self.request_context = self.app.flask_app.test_request_context()
-        self.request_context.push()
-
-    def teardown(self):
-
-        self.request_context.pop()
-
     def test_create_creates_index_on_primary_key(self):
         package = factories.Dataset()
         data = {
@@ -263,14 +254,14 @@ def test_create_exceeds_column_name_limit(self):
         result = helpers.call_action('datastore_create', **data)
 
 
-class TestDatastoreCreate(tests.WsgiAppCase):
+class TestDatastoreCreate():
     sysadmin_user = None
     normal_user = None
 
     @classmethod
     def setup_class(cls):
 
-        cls.app = helpers._get_test_app()
+        cls.app = _get_test_app()
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
@@ -279,24 +270,14 @@ def setup_class(cls):
         cls.normal_user = model.User.get('annafan')
         engine = db.get_write_engine()
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))
-        with cls.app.flask_app.test_request_context():
-            set_url_type(
-                model.Package.get('annakarenina').resources, cls.sysadmin_user)
+        set_url_type(
+            model.Package.get('annakarenina').resources, cls.sysadmin_user)
 
     @classmethod
     def teardown_class(cls):
         rebuild_all_dbs(cls.Session)
         p.unload('datastore')
 
-    def setup(self):
-
-        self.request_context = self.app.flask_app.test_request_context()
-        self.request_context.push()
-
-    def teardown(self):
-
-        self.request_context.pop()
-
     def test_create_requires_auth(self):
         resource = model.Package.get('annakarenina').resources[0]
         data = {
diff --git a/ckanext/datastore/tests/test_delete.py b/ckanext/datastore/tests/test_delete.py
index 54cfaf8daf0..0bba49743c9 100644
--- a/ckanext/datastore/tests/test_delete.py
+++ b/ckanext/datastore/tests/test_delete.py
@@ -22,17 +22,16 @@
 assert_raises = nose.tools.assert_raises
 
 
-class TestDatastoreDelete(tests.WsgiAppCase):
+class TestDatastoreDelete():
     sysadmin_user = None
     normal_user = None
     Session = None
 
     @classmethod
     def setup_class(cls):
-
-        cls.app = helpers._get_test_app()
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
+        cls.app = helpers._get_test_app()
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
@@ -53,10 +52,8 @@ def setup_class(cls):
         engine = db.get_write_engine()
 
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))
-
-        with cls.app.flask_app.test_request_context():
-            set_url_type(
-                model.Package.get('annakarenina').resources, cls.sysadmin_user)
+        set_url_type(
+            model.Package.get('annakarenina').resources, cls.sysadmin_user)
 
     @classmethod
     def teardown_class(cls):
@@ -119,10 +116,9 @@ def test_datastore_deleted_during_resource_deletion(self):
             },
         }
 
-        with self.app.flask_app.test_request_context():
-            result = helpers.call_action('datastore_create', **data)
-            resource_id = result['resource_id']
-            helpers.call_action('resource_delete', id=resource_id)
+        result = helpers.call_action('datastore_create', **data)
+        resource_id = result['resource_id']
+        helpers.call_action('resource_delete', id=resource_id)
 
         assert_raises(
             NotFound, helpers.call_action, 'datastore_search',
diff --git a/ckanext/datastore/tests/test_dump.py b/ckanext/datastore/tests/test_dump.py
index 9eba0be486e..ad0aff3294f 100644
--- a/ckanext/datastore/tests/test_dump.py
+++ b/ckanext/datastore/tests/test_dump.py
@@ -2,7 +2,6 @@
 
 import json
 
-import ckan.config.middleware as middleware
 import ckan.lib.create_test_data as ctd
 import ckan.model as model
 import ckan.plugins as p
@@ -10,13 +9,10 @@
 import ckanext.datastore.backend.postgres as db
 import ckanext.datastore.tests.helpers as helpers
 import nose
-import paste.fixture
+from ckan.tests.helpers import _get_test_app
 import sqlalchemy.orm as orm
-from ckan.common import config
 from nose.tools import assert_equals, assert_in
 
-import ckan.tests.helpers as test_helpers
-
 
 class TestDatastoreDump(object):
     sysadmin_user = None
@@ -24,8 +20,7 @@ class TestDatastoreDump(object):
 
     @classmethod
     def setup_class(cls):
-        test_helpers.reset_db()
-        cls.app = test_helpers._get_test_app()
+        cls.app = _get_test_app()
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
diff --git a/ckanext/datastore/tests/test_search.py b/ckanext/datastore/tests/test_search.py
index d7bf64e3729..e63f230c683 100644
--- a/ckanext/datastore/tests/test_search.py
+++ b/ckanext/datastore/tests/test_search.py
@@ -108,14 +108,16 @@ def test_all_params_work_with_fields_with_whitespaces(self):
 
 
 
-class TestDatastoreSearch(tests.WsgiAppCase):
+class TestDatastoreSearch():
     sysadmin_user = None
     normal_user = None
 
     @classmethod
     def setup_class(cls):
+
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
+        cls.app = helpers._get_test_app()
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
@@ -647,11 +649,12 @@ def test_search_is_unsuccessful_when_called_with_invalid_fields(self):
         assert res_dict['error'].get('fields') is not None, res_dict['error']
 
 
-class TestDatastoreFullTextSearch(tests.WsgiAppCase):
+class TestDatastoreFullTextSearch():
     @classmethod
     def setup_class(cls):
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
+        cls.app = helpers._get_test_app()
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
@@ -774,7 +777,7 @@ def test_full_text_search_on_json_like_string_succeeds(self):
         assert res_dict['success'], pprint.pformat(res_dict)
 
 
-class TestDatastoreSQL(tests.WsgiAppCase):
+class TestDatastoreSQL():
     sysadmin_user = None
     normal_user = None
 
@@ -782,6 +785,7 @@ class TestDatastoreSQL(tests.WsgiAppCase):
     def setup_class(cls):
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
+        cls.app = helpers._get_test_app()
         plugin = p.load('datastore')
         if plugin.legacy_mode:
             # make sure we undo adding the plugin
diff --git a/ckanext/datastore/tests/test_upsert.py b/ckanext/datastore/tests/test_upsert.py
index 2ee340de273..8d11ec13b20 100644
--- a/ckanext/datastore/tests/test_upsert.py
+++ b/ckanext/datastore/tests/test_upsert.py
@@ -77,7 +77,7 @@ def test_upsert_doesnt_crash_with_json_field_with_string_value(self):
         helpers.call_action('datastore_upsert', **data)
 
 
-class TestDatastoreUpsert(tests.WsgiAppCase):
+class TestDatastoreUpsert():
     sysadmin_user = None
     normal_user = None
 
@@ -85,16 +85,13 @@ class TestDatastoreUpsert(tests.WsgiAppCase):
     def setup_class(cls):
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
-
         cls.app = helpers._get_test_app()
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.normal_user = model.User.get('annafan')
-
-        with cls.app.flask_app.test_request_context():
-            set_url_type(
-                model.Package.get('annakarenina').resources, cls.sysadmin_user)
+        set_url_type(
+            model.Package.get('annakarenina').resources, cls.sysadmin_user)
         resource = model.Package.get('annakarenina').resources[0]
         cls.data = {
             'resource_id': resource.id,
@@ -331,7 +328,8 @@ def test_upsert_works_with_empty_list_in_json_field(self):
                      data['records'][0]['nested'])
 
 
-class TestDatastoreInsert(tests.WsgiAppCase):
+
+class TestDatastoreInsert():
     sysadmin_user = None
     normal_user = None
 
@@ -339,32 +337,34 @@ class TestDatastoreInsert(tests.WsgiAppCase):
     def setup_class(cls):
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
-
         cls.app = helpers._get_test_app()
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.normal_user = model.User.get('annafan')
-        with cls.app.flask_app.test_request_context():
-            set_url_type(
-                model.Package.get('annakarenina').resources, cls.sysadmin_user)
-            resource = model.Package.get('annakarenina').resources[0]
-            cls.data = {
-                'resource_id': resource.id,
-                'fields': [{'id': u'b\xfck', 'type': 'text'},
-                           {'id': 'author', 'type': 'text'},
-                           {'id': 'nested', 'type': 'json'},
-                           {'id': 'characters', 'type': 'text[]'},
-                           {'id': 'published'}],
-                'primary_key': u'b\xfck',
-                'records': [{u'b\xfck': 'annakarenina', 'author': 'tolstoy',
-                            'published': '2005-03-01', 'nested': ['b', {'moo': 'moo'}]},
-                            {u'b\xfck': 'warandpeace', 'author': 'tolstoy',
-                            'nested': {'a':'b'}}
-                           ]
-                }
-
-            helpers.call_action('datastore_create', **cls.data)
+        set_url_type(
+            model.Package.get('annakarenina').resources, cls.sysadmin_user)
+        resource = model.Package.get('annakarenina').resources[0]
+        cls.data = {
+            'resource_id': resource.id,
+            'fields': [{'id': u'b\xfck', 'type': 'text'},
+                       {'id': 'author', 'type': 'text'},
+                       {'id': 'nested', 'type': 'json'},
+                       {'id': 'characters', 'type': 'text[]'},
+                       {'id': 'published'}],
+            'primary_key': u'b\xfck',
+            'records': [{u'b\xfck': 'annakarenina', 'author': 'tolstoy',
+                        'published': '2005-03-01', 'nested': ['b', {'moo': 'moo'}]},
+                        {u'b\xfck': 'warandpeace', 'author': 'tolstoy',
+                        'nested': {'a':'b'}}
+                       ]
+            }
+        postparams = '%s=1' % json.dumps(cls.data)
+        auth = {'Authorization': str(cls.sysadmin_user.apikey)}
+        res = cls.app.post('/api/action/datastore_create', params=postparams,
+                           extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
 
         engine = db.get_write_engine()
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))
@@ -431,7 +431,7 @@ def test_insert_basic(self):
         assert results.rowcount == 3
 
 
-class TestDatastoreUpdate(tests.WsgiAppCase):
+class TestDatastoreUpdate():
     sysadmin_user = None
     normal_user = None
 
@@ -439,15 +439,13 @@ class TestDatastoreUpdate(tests.WsgiAppCase):
     def setup_class(cls):
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
-
         cls.app = helpers._get_test_app()
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.normal_user = model.User.get('annafan')
-        with cls.app.flask_app.test_request_context():
-            set_url_type(
-                model.Package.get('annakarenina').resources, cls.sysadmin_user)
+        set_url_type(
+            model.Package.get('annakarenina').resources, cls.sysadmin_user)
         resource = model.Package.get('annakarenina').resources[0]
         hhguide = u"hitchhiker's guide to the galaxy"
         cls.data = {
diff --git a/ckanext/example_idatasetform/tests/test_controllers.py b/ckanext/example_idatasetform/tests/test_controllers.py
index 86657dc83af..8ffe1296947 100644
--- a/ckanext/example_idatasetform/tests/test_controllers.py
+++ b/ckanext/example_idatasetform/tests/test_controllers.py
@@ -14,10 +14,8 @@
 def _get_package_edit_page(app, package_name):
     user = factories.User()
     env = {'REMOTE_USER': user['name'].encode('ascii')}
-    with app.flask_app.test_request_context():
-        url = url_for(controller='package', action='edit', id=package_name)
     response = app.get(
-        url,
+        url=url_for(controller='package', action='edit', id=package_name),
         extra_environ=env,
     )
     return env, response
diff --git a/ckanext/example_igroupform/tests/test_controllers.py b/ckanext/example_igroupform/tests/test_controllers.py
index 10b9567f0d2..d178842d8a9 100644
--- a/ckanext/example_igroupform/tests/test_controllers.py
+++ b/ckanext/example_igroupform/tests/test_controllers.py
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-from ckan.lib.helpers import url_for
 from nose.tools import assert_equal, assert_in
+from ckan.lib.helpers import url_for
 
 import ckan.plugins as plugins
 import ckan.tests.helpers as helpers
@@ -18,10 +18,8 @@
 def _get_group_new_page(app, group_type):
     user = factories.User()
     env = {'REMOTE_USER': user['name'].encode('ascii')}
-    with app.flask_app.test_request_context():
-        url = url_for('%s_new' % group_type)
     response = app.get(
-        url,
+        url_for('%s_new' % group_type),
         extra_environ=env,
     )
     return env, response
@@ -44,10 +42,8 @@ def test_about(self):
         group = factories.Group(user=user, type=custom_group_type)
         group_name = group['name']
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for('%s_about' % custom_group_type,
-                          id=group_name)
+        url = url_for('%s_about' % custom_group_type,
+                      id=group_name)
         response = app.get(url=url, extra_environ=env)
         response.mustcontain(group_name)
 
@@ -57,10 +53,8 @@ def test_bulk_process(self):
         group = factories.Group(user=user, type=custom_group_type)
         group_name = group['name']
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for('%s_bulk_process' % custom_group_type,
-                          id=group_name)
+        url = url_for('%s_bulk_process' % custom_group_type,
+                      id=group_name)
         try:
             response = app.get(url=url, extra_environ=env)
         except Exception as e:
@@ -74,10 +68,8 @@ def test_delete(self):
         group = factories.Group(user=user, type=custom_group_type)
         group_name = group['name']
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for('%s_action' % custom_group_type, action='delete',
-                          id=group_name)
+        url = url_for('%s_action' % custom_group_type, action='delete',
+                      id=group_name)
         response = app.get(url=url, extra_environ=env)
 
 
@@ -98,10 +90,8 @@ def test_about(self):
         group = factories.Organization(user=user, type=custom_group_type)
         group_name = group['name']
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for('%s_about' % custom_group_type,
-                          id=group_name)
+        url = url_for('%s_about' % custom_group_type,
+                      id=group_name)
         response = app.get(url=url, extra_environ=env)
         response.mustcontain(group_name)
 
@@ -111,10 +101,8 @@ def test_bulk_process(self):
         group = factories.Organization(user=user, type=custom_group_type)
         group_name = group['name']
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for('%s_bulk_process' % custom_group_type,
-                          id=group_name)
+        url = url_for('%s_bulk_process' % custom_group_type,
+                      id=group_name)
         response = app.get(url=url, extra_environ=env)
 
     def test_delete(self):
@@ -123,10 +111,8 @@ def test_delete(self):
         group = factories.Organization(user=user, type=custom_group_type)
         group_name = group['name']
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for('%s_action' % custom_group_type, action='delete',
-                          id=group_name)
+        url = url_for('%s_action' % custom_group_type, action='delete',
+                      id=group_name)
         response = app.get(url=url, extra_environ=env)
 
 
@@ -208,9 +194,8 @@ def _get_group_edit_page(app, group_type, group_name=None):
         group = factories.Group(user=user, type=group_type)
         group_name = group['name']
     env = {'REMOTE_USER': user['name'].encode('ascii')}
-    with app.flask_app.test_request_context():
-        url = url_for('%s_edit' % group_type,
-                      id=group_name)
+    url = url_for('%s_edit' % group_type,
+                  id=group_name)
     response = app.get(url=url, extra_environ=env)
     return env, response, group_name
 
@@ -230,10 +215,8 @@ def test_group_doesnt_exist(self):
         app = self._get_test_app()
         user = factories.User()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for('%s_edit' % custom_group_type,
-                          id='doesnt_exist')
+        url = url_for('%s_edit' % custom_group_type,
+                      id='doesnt_exist')
         app.get(url=url, extra_environ=env,
                 status=404)
 
@@ -273,10 +256,8 @@ def test_group_doesnt_exist(self):
         app = self._get_test_app()
         user = factories.User()
         env = {'REMOTE_USER': user['name'].encode('ascii')}
-
-        with app.flask_app.test_request_context():
-            url = url_for('%s_edit' % group_type,
-                          id='doesnt_exist')
+        url = url_for('%s_edit' % group_type,
+                      id='doesnt_exist')
         app.get(url=url, extra_environ=env,
                 status=404)
 
diff --git a/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py b/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
index b4ccf746b02..7721f9b299d 100644
--- a/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
+++ b/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
@@ -4,10 +4,8 @@
 
 '''
 from ckan.common import config
-import webtest
 
 import ckan.model as model
-import ckan.tests.legacy as tests
 
 import ckan.plugins
 import ckan.tests.factories as factories
@@ -22,9 +20,7 @@ class TestExampleIResourceController(object):
 
     def setup(self):
         # Set up the test app
-        self.app = ckan.config.middleware.make_app(
-            config['global_conf'], **config)
-        self.app = webtest.TestApp(self.app)
+        self.app = helpers._get_test_app()
 
     def teardown(self):
         # Unload the plugin
diff --git a/ckanext/example_itranslation/tests/test_plugin.py b/ckanext/example_itranslation/tests/test_plugin.py
index d256343df2c..cd794434aaa 100644
--- a/ckanext/example_itranslation/tests/test_plugin.py
+++ b/ckanext/example_itranslation/tests/test_plugin.py
@@ -19,60 +19,48 @@ def teardown_class(cls):
 
     def test_translated_string_in_extensions_templates(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = plugins.toolkit.url_for(controller='home', action='index',
-                                          locale='fr')
-
-        response = app.get(url)
+        response = app.get(
+            url=plugins.toolkit.url_for(controller='home', action='index',
+                                        locale='fr'),
+        )
         assert_true('This is a itranslated string' in response.body)
         assert_false('This is an untranslated string' in response.body)
 
         # double check the untranslated strings
-
-        with app.flask_app.test_request_context():
-            url = plugins.toolkit.url_for(controller='home', action='index')
-
-        response = app.get(url)
+        response = app.get(
+            url=plugins.toolkit.url_for(controller='home', action='index'),
+        )
         assert_true('This is an untranslated string' in response.body)
         assert_false('This is a itranslated string' in response.body)
 
     def test_translated_string_in_core_templates(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = plugins.toolkit.url_for(controller='home', action='index',
-                                          locale='fr')
-
-        response = app.get(url)
+        response = app.get(
+            url=plugins.toolkit.url_for(controller='home', action='index',
+                                        locale='fr'),
+        )
         assert_true('Overwritten string in ckan.mo' in response.body)
         assert_false('Connexion' in response.body)
 
         # double check the untranslated strings
-
-        with app.flask_app.test_request_context():
-            url = plugins.toolkit.url_for(controller='home', action='index')
-
-        response = app.get(url)
+        response = app.get(
+            url=plugins.toolkit.url_for(controller='home', action='index'),
+        )
         assert_true('Log in' in response.body)
         assert_false('Overwritten string in ckan.mo' in response.body)
 
         # check that we have only overwritten 'fr'
-
-        with app.flask_app.test_request_context():
-            url = plugins.toolkit.url_for(controller='home', action='index',
-                                          locale='de')
-
-        response = app.get(url)
+        response = app.get(
+            url=plugins.toolkit.url_for(controller='home', action='index',
+                                        locale='de'),
+        )
         assert_true('Einloggen' in response.body)
         assert_false('Overwritten string in ckan.mo' in response.body)
 
     def test_english_translation_replaces_default_english_string(self):
         app = self._get_test_app()
-
-        with app.flask_app.test_request_context():
-            url = plugins.toolkit.url_for(controller='home', action='index')
-
-        response = app.get(url)
+        response = app.get(
+            url=plugins.toolkit.url_for(controller='home', action='index'),
+        )
         assert_true('Replaced' in response.body)
         assert_false('Register' in response.body)
diff --git a/ckanext/example_iuploader/test/test_plugin.py b/ckanext/example_iuploader/test/test_plugin.py
index 3259fa9ec6c..b7ba43d1286 100644
--- a/ckanext/example_iuploader/test/test_plugin.py
+++ b/ckanext/example_iuploader/test/test_plugin.py
@@ -10,7 +10,7 @@
     assert_is_instance
 )
 from pyfakefs import fake_filesystem
-from routes import url_for
+from ckan.lib.helpers import url_for
 
 import ckan.lib.uploader
 import ckan.model as model
diff --git a/ckanext/imageview/tests/test_view.py b/ckanext/imageview/tests/test_view.py
index 03b0a43fa7d..5bd3bc977c3 100644
--- a/ckanext/imageview/tests/test_view.py
+++ b/ckanext/imageview/tests/test_view.py
@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-
 from ckan.lib.helpers import url_for
 
 import ckan.plugins as p
@@ -40,9 +39,8 @@ def test_view_shown_on_resource_page_with_image_url(self):
             resource_id=resource['id'],
             image_url='http://some.image.png')
 
-        with app.flask_app.test_request_context():
-            url = url_for(controller='package', action='resource_read',
-                          id=dataset['name'], resource_id=resource['id'])
+        url = url_for(controller='package', action='resource_read',
+                      id=dataset['name'], resource_id=resource['id'])
 
         response = app.get(url)
 
diff --git a/ckanext/multilingual/tests/test_multilingual_plugin.py b/ckanext/multilingual/tests/test_multilingual_plugin.py
index 67d0eaeb40d..a5ff4f370eb 100644
--- a/ckanext/multilingual/tests/test_multilingual_plugin.py
+++ b/ckanext/multilingual/tests/test_multilingual_plugin.py
@@ -2,16 +2,14 @@
 
 import ckan.plugins
 import ckanext.multilingual.plugin as mulilingual_plugin
-
-import ckan.plugins as p
-from ckan.lib.helpers import url_for
+import ckan.lib.helpers
 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
-from ckan.tests import helpers
-
+import routes
+from ckan.tests.helpers import _get_test_app
 
 _create_test_data = ckan.lib.create_test_data
 
@@ -19,18 +17,12 @@
 class TestDatasetTermTranslation(ckan.tests.legacy.html_check.HtmlCheckMethods):
     'Test the translation of datasets by the multilingual_dataset plugin.'
     @classmethod
-    def setup_class(cls):
-        cls.app = helpers._get_test_app()
-
-        if not p.plugin_loaded('multilingual_dataset'):
-            p.load('multilingual_dataset')
-
-        if not p.plugin_loaded('multilingual_group'):
-            p.load('multilingual_group')
-
-        if not p.plugin_loaded('multilingual_tag'):
-            p.load('multilingual_tag')
+    def setup(cls):
 
+        cls.app = _get_test_app()
+        ckan.plugins.load('multilingual_dataset')
+        ckan.plugins.load('multilingual_group')
+        ckan.plugins.load('multilingual_tag')
         ckan.tests.legacy.setup_test_search_index()
         _create_test_data.CreateTestData.create_translations_test_data()
 
@@ -63,10 +55,10 @@ def setup_class(cls):
                     context, data_dict)
 
     @classmethod
-    def teardown_class(cls):
-        p.unload('multilingual_dataset')
-        p.unload('multilingual_group')
-        p.unload('multilingual_tag')
+    def teardown(cls):
+        ckan.plugins.unload('multilingual_dataset')
+        ckan.plugins.unload('multilingual_group')
+        ckan.plugins.unload('multilingual_tag')
         ckan.model.repo.rebuild_db()
         ckan.lib.search.clear_all()
 
@@ -78,30 +70,29 @@ def test_user_read_translation(self):
 
         # It is testsysadmin who created the dataset, so testsysadmin whom
         # we'd expect to see the datasets for.
-        with self.app.flask_app.test_request_context():
-            for user_name in ('testsysadmin',):
-                offset = url_for(
-                    controller='user', action='read', id=user_name)
-                for (lang_code, translations) in (
-                        ('de', _create_test_data.german_translations),
-                        ('fr', _create_test_data.french_translations),
-                        ('en', _create_test_data.english_translations),
-                        ('pl', {})):
-                    response = self.app.get(
-                        offset,
-                        status=200,
-                        extra_environ={'CKAN_LANG': lang_code,
-                                       'CKAN_CURRENT_URL': offset})
-                    terms = ('A Novel By Tolstoy')
-                    for term in terms:
-                        if term in translations:
-                            assert translations[term] in response, response
-                        elif term in _create_test_data.english_translations:
-                            assert (_create_test_data.english_translations[term]
-                                    in response)
-                        else:
-                            assert term in response
-                    assert 'this should not be rendered' not in response
+        for user_name in ('testsysadmin',):
+            offset = routes.url_for(
+                controller='user', action='read', id=user_name)
+            for (lang_code, translations) in (
+                    ('de', _create_test_data.german_translations),
+                    ('fr', _create_test_data.french_translations),
+                    ('en', _create_test_data.english_translations),
+                    ('pl', {})):
+                response = self.app.get(
+                    offset,
+                    status=200,
+                    extra_environ={'CKAN_LANG': lang_code,
+                                   'CKAN_CURRENT_URL': offset})
+                terms = ('A Novel By Tolstoy')
+                for term in terms:
+                    if term in translations:
+                        assert translations[term] in response, response
+                    elif term in _create_test_data.english_translations:
+                        assert (_create_test_data.english_translations[term]
+                                in response)
+                    else:
+                        assert term in response
+                assert 'this should not be rendered' not in response
 
     def test_org_read_translation(self):
         for (lang_code, translations) in (
diff --git a/ckanext/reclineview/tests/test_view.py b/ckanext/reclineview/tests/test_view.py
index 164b1389825..5df193d4fc4 100644
--- a/ckanext/reclineview/tests/test_view.py
+++ b/ckanext/reclineview/tests/test_view.py
@@ -1,25 +1,24 @@
 # encoding: utf-8
 
-import paste.fixture
+from ckan.tests.helpers import _get_test_app
 from ckan.common import config
 
 import ckan.model as model
-import ckan.tests.legacy as tests
 import ckan.plugins as p
 import ckan.lib.helpers as h
 import ckanext.reclineview.plugin as plugin
 import ckan.lib.create_test_data as create_test_data
-import ckan.config.middleware as middleware
 
 from ckan.tests import helpers, factories
 
 
-class BaseTestReclineViewBase(object):
+class BaseTestReclineViewBase():
     @classmethod
     def setup_class(cls):
+        cls.config_templates = config['ckan.legacy_templates']
+        config['ckan.legacy_templates'] = 'false'
 
-        cls.app = helpers._get_test_app()
-
+        cls.app = _get_test_app()
         p.load(cls.view_type)
 
         cls.p = cls.view_class()
@@ -31,6 +30,7 @@ def setup_class(cls):
 
     @classmethod
     def teardown_class(cls):
+        config['ckan.legacy_templates'] = cls.config_templates
         p.unload(cls.view_type)
         model.repo.rebuild_db()
 
@@ -42,10 +42,8 @@ def test_can_view(self):
         assert not self.p.can_view(data_dict)
 
     def test_title_description_iframe_shown(self):
-
-        with self.app.flask_app.test_request_context():
-            url = h.url_for(controller='package', action='resource_read',
-                            id=self.package.name, resource_id=self.resource_id)
+        url = h.url_for(controller='package', action='resource_read',
+                        id=self.package.name, resource_id=self.resource_id)
         result = self.app.get(url)
         assert self.resource_view['title'] in result
         assert self.resource_view['description'] in result
@@ -86,12 +84,15 @@ class TestReclineViewDatastoreOnly(helpers.FunctionalTestBase):
 
     @classmethod
     def setup_class(cls):
-
-        cls.app = helpers._get_test_app()
+        cls.app = _get_test_app()
         if not p.plugin_loaded('recline_view'):
             p.load('recline_view')
         if not p.plugin_loaded('datastore'):
             p.load('datastore')
+        app_config = config.copy()
+        app_config['ckan.legacy_templates'] = 'false'
+        app_config['ckan.plugins'] = 'recline_view datastore'
+        app_config['ckan.views.default_views'] = 'recline_view'
 
     @classmethod
     def teardown_class(cls):
@@ -107,16 +108,12 @@ def test_create_datastore_only_view(self):
             'fields': [{'id': 'a'}, {'id': 'b'}],
             'records': [{'a': 1, 'b': 'xyz'}, {'a': 2, 'b': 'zzz'}]
         }
+        result = helpers.call_action('datastore_create', **data)
 
-        # datastore_create will call internally (or trigger something that
-        # calls it) so we need a Flask app context
-        with self.app.flask_app.test_request_context():
-            result = helpers.call_action('datastore_create', **data)
-
-            resource_id = result['resource_id']
+        resource_id = result['resource_id']
 
-            url = h.url_for(controller='package', action='resource_read',
-                            id=dataset['id'], resource_id=resource_id)
+        url = h.url_for(controller='package', action='resource_read',
+                        id=dataset['id'], resource_id=resource_id)
 
         result = self.app.get(url)
 
diff --git a/ckanext/resourceproxy/tests/test_proxy.py b/ckanext/resourceproxy/tests/test_proxy.py
index d70e7213c6f..386e4245276 100644
--- a/ckanext/resourceproxy/tests/test_proxy.py
+++ b/ckanext/resourceproxy/tests/test_proxy.py
@@ -1,10 +1,11 @@
 # encoding: utf-8
 
 import requests
+import unittest
 import json
 import httpretty
-from nose.tools import assert_raises
 
+from ckan.tests.helpers import _get_test_app
 from ckan.common import config
 
 import ckan.model as model
@@ -12,7 +13,6 @@
 import ckan.lib.create_test_data as create_test_data
 import ckanext.resourceproxy.controller as controller
 import ckanext.resourceproxy.plugin as proxy
-from ckan.tests import helpers
 
 
 JSON_STRING = json.dumps({
@@ -45,15 +45,17 @@ def set_resource_url(url):
     return {'resource': resource, 'package': package}
 
 
-class TestProxyPrettyfied(object):
+class TestProxyPrettyfied(unittest.TestCase):
 
     serving = False
 
     @classmethod
     def setup_class(cls):
         cls._original_config = config.copy()
+        cls.app = _get_test_app()
+        if not p.plugin_loaded('resource_proxy'):
+            p.load('resource_proxy')
         config['ckan.plugins'] = 'resource_proxy'
-        cls.app = helpers._get_test_app()
         create_test_data.CreateTestData.create()
 
     @classmethod
@@ -62,17 +64,10 @@ def teardown_class(cls):
         config.update(cls._original_config)
         model.repo.rebuild_db()
 
-    def setup(self):
+    def setUp(self):
         self.url = 'http://www.ckan.org/static/example.json'
         self.data_dict = set_resource_url(self.url)
 
-        self.request_context = self.app.flask_app.test_request_context()
-        self.request_context.push()
-
-    def teardown(self):
-
-        self.request_context.pop()
-
     def register(self, *args, **kwargs):
         httpretty.HTTPretty.register_uri(httpretty.HTTPretty.GET, *args,
                                          **kwargs)
@@ -107,7 +102,7 @@ def test_resource_proxy_on_404(self):
         result = self.app.get(proxied_url, status='*')
         # we expect a 409 because the resourceproxy got an error (404)
         # from the server
-        assert result.status_int == 409, result.status_int
+        assert result.status_int == 409, result.status
         assert '404' in result.body
 
     @httpretty.activate
@@ -120,7 +115,7 @@ def test_large_file(self):
 
         proxied_url = proxy.get_proxified_resource_url(self.data_dict)
         result = self.app.get(proxied_url, status='*')
-        assert result.status_int == 409, result.status_int
+        assert result.status_int == 409, result.status
         assert 'too large' in result.body, result.body
 
     @httpretty.activate
@@ -133,7 +128,7 @@ def test_large_file_streaming(self):
 
         proxied_url = proxy.get_proxified_resource_url(self.data_dict)
         result = self.app.get(proxied_url, status='*')
-        assert result.status_int == 409, result.status_int
+        assert result.status_int == 409, result.status
         assert 'too large' in result.body, result.body
 
     @httpretty.activate
@@ -142,7 +137,7 @@ def test_invalid_url(self):
 
         proxied_url = proxy.get_proxified_resource_url(self.data_dict)
         result = self.app.get(proxied_url, status='*')
-        assert result.status_int == 409, result.status_int
+        assert result.status_int == 409, result.status
         assert 'Invalid URL' in result.body, result.body
 
     def test_non_existent_url(self):
@@ -152,11 +147,11 @@ def f1():
             url = self.data_dict['resource']['url']
             requests.get(url)
 
-        assert_raises(requests.ConnectionError, f1)
+        self.assertRaises(requests.ConnectionError, f1)
 
         proxied_url = proxy.get_proxified_resource_url(self.data_dict)
         result = self.app.get(proxied_url, status='*')
-        assert result.status_int == 502, result.status_int
+        assert result.status_int == 502, result.status
         assert 'connection error' in result.body, result.body
 
     def test_proxied_resource_url_proxies_http_and_https_by_default(self):
diff --git a/ckanext/stats/tests/__init__.py b/ckanext/stats/tests/__init__.py
index d149dbb11b5..e14db7e29f3 100644
--- a/ckanext/stats/tests/__init__.py
+++ b/ckanext/stats/tests/__init__.py
@@ -1,8 +1,8 @@
 # encoding: utf-8
 
-import paste.fixture
+from ckan.tests.helpers import _get_test_app
 from ckan.common import config
-from ckan.config.middleware import make_app
+
 
 class StatsFixture(object):
 
@@ -10,8 +10,7 @@ class StatsFixture(object):
     def setup_class(cls):
         cls._original_config = config.copy()
         config['ckan.plugins'] = 'stats'
-        wsgiapp = make_app(config['global_conf'], **config)
-        cls.app = paste.fixture.TestApp(wsgiapp)
+        cls.app = _get_test_app()
 
     @classmethod
     def teardown_class(cls):
diff --git a/ckanext/stats/tests/test_stats_plugin.py b/ckanext/stats/tests/test_stats_plugin.py
index fa7e2f12dc6..ab802917f73 100644
--- a/ckanext/stats/tests/test_stats_plugin.py
+++ b/ckanext/stats/tests/test_stats_plugin.py
@@ -2,6 +2,8 @@
 
 import os
 
+from ckan.tests.legacy import url_for
+
 from ckanext.stats.tests import StatsFixture
 
 class TestStatsPlugin(StatsFixture):
diff --git a/ckanext/textview/tests/test_view.py b/ckanext/textview/tests/test_view.py
index 7d1c541a683..28927ba7d7c 100644
--- a/ckanext/textview/tests/test_view.py
+++ b/ckanext/textview/tests/test_view.py
@@ -1,16 +1,12 @@
 # encoding: utf-8
-
-import paste.fixture
 from ckan.common import config
 import urlparse
 
 import ckan.model as model
-import ckan.tests.legacy as tests
 import ckan.plugins as plugins
 import ckan.lib.helpers as h
 import ckanext.textview.plugin as plugin
 import ckan.lib.create_test_data as create_test_data
-import ckan.config.middleware as middleware
 from ckan.tests import helpers
 
 
diff --git a/ckanext/webpageview/tests/test_view.py b/ckanext/webpageview/tests/test_view.py
index 9b6e03d64d6..cab666e8515 100644
--- a/ckanext/webpageview/tests/test_view.py
+++ b/ckanext/webpageview/tests/test_view.py
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-from routes import url_for
+from ckan.lib.helpers import url_for
 
 import ckan.plugins as p
 

From 28caf7ded72cc3ba638269809b63c49007228c73 Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Wed, 23 Aug 2017 15:41:39 +0100
Subject: [PATCH 5/5] [#3760] Fix some more tests after reversing context
 changes

---
 ckan/tests/controllers/test_user.py        | 2 ++
 ckan/tests/legacy/test_coding_standards.py | 2 +-
 ckan/tests/lib/test_helpers.py             | 1 -
 ckan/tests/test_none_root.py               | 6 +-----
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ckan/tests/controllers/test_user.py b/ckan/tests/controllers/test_user.py
index be352bca2e9..3dc24df73b3 100644
--- a/ckan/tests/controllers/test_user.py
+++ b/ckan/tests/controllers/test_user.py
@@ -183,6 +183,8 @@ def test_non_root_user_logout_url_redirect(self):
         app = self._get_test_app()
 
         logout_url = url_for(controller='user', action='logout')
+        # Remove the prefix otherwise the test app won't find the correct route
+        logout_url = logout_url.replace('/my/prefix', '')
         logout_response = app.get(logout_url, status=302)
         assert_equal(logout_response.status_int, 302)
         assert_true('/my/prefix/user/logout' in logout_response.location)
diff --git a/ckan/tests/legacy/test_coding_standards.py b/ckan/tests/legacy/test_coding_standards.py
index 5bd74bf6430..26e72c9633f 100644
--- a/ckan/tests/legacy/test_coding_standards.py
+++ b/ckan/tests/legacy/test_coding_standards.py
@@ -553,6 +553,7 @@ class TestPep8(object):
         'ckan/tests/legacy/functional/test_search.py',
         'ckan/tests/legacy/functional/test_tag.py',
         'ckan/tests/legacy/functional/test_tag_vocab.py',
+        'ckan/tests/legacy/functional/test_tracking.py',
         'ckan/tests/legacy/functional/test_upload.py',
         'ckan/tests/legacy/functional/test_user.py',
         'ckan/tests/legacy/html_check.py',
@@ -609,7 +610,6 @@ class TestPep8(object):
         'ckanext/stats/controller.py',
         'ckanext/stats/plugin.py',
         'ckanext/stats/stats.py',
-        'ckanext/stats/tests/__init__.py',
         'ckanext/stats/tests/test_stats_lib.py',
         'ckanext/stats/tests/test_stats_plugin.py',
         'ckanext/test_tag_vocab_plugin.py',
diff --git a/ckan/tests/lib/test_helpers.py b/ckan/tests/lib/test_helpers.py
index 1776f366e46..9ce8740d5b3 100644
--- a/ckan/tests/lib/test_helpers.py
+++ b/ckan/tests/lib/test_helpers.py
@@ -204,7 +204,6 @@ def test_url_for_qualified_with_root_path_locale_and_script_name_env(self):
         eq_(generated_url, url)
 
 
-
 class TestHelpersUrlForFlaskandPylons2(BaseUrlFor):
 
     def test_url_for_flask_route_new_syntax(self):
diff --git a/ckan/tests/test_none_root.py b/ckan/tests/test_none_root.py
index 7ee1d220697..74dc82a9eb1 100644
--- a/ckan/tests/test_none_root.py
+++ b/ckan/tests/test_none_root.py
@@ -1,17 +1,13 @@
 # encoding: utf-8
 
-from ckan.common import config
 import ckan.plugins as p
-import ckan.config.middleware as middleware
-import webtest
 import ckan.tests.helpers as helpers
 
 
 class TestNoneRootCKAN():
     @helpers.change_config(u'ckan.root_path', u'/data/{{LANG}}')
     def test_resource_url(self):
-        wsgiapp = middleware.make_app(config[u'global_conf'], **config)
-        app = webtest.TestApp(wsgiapp)
+        app = helpers._get_test_app()
         p.load(u'example_theme_v15_fanstatic')
         content = app.get(u'/en/base.html')
         assert u'example_theme.css' in content