Let Flask manage its own request contexts (#108)

* Let Flask manage its own request contexts

* Fix tests for python 3

Author: Jonathan Como

flask_testing/utils.py

@@ -148,9 +148,6 @@ def _pre_setup(self):
 
         self.client = self.app.test_client()
 
-        self._ctx = self.app.test_request_context()
-        self._ctx.push()
-
         if not self.render_templates:
             # Monkey patch the original template render with a empty render
             self._original_template_render = templating._render
@@ -174,10 +171,6 @@ def _add_template(self, app, template, context):
         self.templates.append((template, context))
 
     def _post_teardown(self):
-        if getattr(self, '_ctx', None) is not None:
-            self._ctx.pop()
-            del self._ctx
-
         if getattr(self, 'app', None) is not None:
             if getattr(self, '_orig_response_class', None) is not None:
                 self.app.response_class = self._orig_response_class
@@ -438,15 +431,10 @@ def __call__(self, result=None):
         self._configured_port = self.app.config.get('LIVESERVER_PORT', 5000)
         self._port_value = multiprocessing.Value('i', self._configured_port)
 
-        # We need to create a context in order for extensions to catch up
-        self._ctx = self.app.test_request_context()
-        self._ctx.push()
-
         try:
             self._spawn_live_server()
             super(LiveServerTestCase, self).__call__(result)
         finally:
-            self._post_teardown()
             self._terminate_live_server()
 
     def get_server_url(self):
@@ -542,11 +530,6 @@ def _get_server_address(self):
 
         return host, port
 
-    def _post_teardown(self):
-        if getattr(self, '_ctx', None) is not None:
-            self._ctx.pop()
-            del self._ctx
-
     def _terminate_live_server(self):
         if self._process:
             self._process.terminate()

tests/flask_app/__init__.py

@@ -7,7 +7,8 @@
     render_template,
     url_for,
     flash,
-    request
+    request,
+    g
 )
 
 
@@ -20,6 +21,14 @@ def create_app():
     def index():
         return Response("OK")
 
+    @app.route("/context")
+    def context():
+        if hasattr(g, "thing"):
+            return "ALREADY SET"
+
+        g.thing = True
+        return "SET"
+
     @app.route("/template/")
     def index_with_template():
         return render_template("index.html", name="test")

tests/test_utils.py

@@ -16,7 +16,6 @@ def create_app(self):
     def test_setup(self):
         self.assertTrue(self.app is not None)
         self.assertTrue(self.client is not None)
-        self.assertTrue(self._ctx is not None)
 
 
 class TestSetupFailure(TestCase):
@@ -40,7 +39,6 @@ def test_remove_testcase_attributes(self):
         """
 
         del self.app
-        del self._ctx
 
 class TestClientUtils(TestCase):
 
@@ -83,6 +81,12 @@ def test_assert_405(self):
     def test_assert_500(self):
         self.assert500(self.client.get("/internal_server_error/"))
 
+    def test_new_context_used_per_request(self):
+        response = self.client.get("/context")
+        self.assertEqual(response.data, b"SET")
+        response = self.client.get("/context")
+        self.assertEqual(response.data, b"SET")
+
     def test_assert_redirects(self):
         response = self.client.get("/redirect/")
         self.assertRedirects(response, "/")