Merge pull request #751 from ThomasWaldmann/sprint-branch

fixing issues found while debugging, fix error in 1 test
2013-05-30 07:08:17 -07:00 · 2013-05-30 07:08:17 -07:00 · 7f35fc2935
commit 7f35fc2935
parent abc1505196 bbfef4c406
2 changed files with 3 additions and 2 deletions
--- a/flask/testsuite/appctx.py
+++ b/flask/testsuite/appctx.py
@ -87,8 +87,9 @@ class AppContextTestCase(FlaskTestCase):
            with flask._app_ctx_stack.top:
                with flask._request_ctx_stack.top:
                    pass
-            self.assert_true(flask._request_ctx_stack.request.environ
+            self.assert_true(flask._request_ctx_stack.top.request.environ
                ['werkzeug.request'] is not None)
+            return u''
        c = app.test_client()
        c.get('/')
        self.assertEqual(called, ['request', 'app'])