Permalink
Browse files

Fixed #17067 -- reverted some backwards-incompatible changes from r16…

…933 and added tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 396fcaa commit 14d24eb438c9930ff76302f263d0f2a8b42d13c1 @aaugustin aaugustin committed Oct 18, 2011
Showing with 26 additions and 2 deletions.
  1. +6 −2 django/test/client.py
  2. +20 −0 tests/regressiontests/test_client_regress/models.py
@@ -182,12 +182,16 @@ def _base_environ(self, **request):
"""
The base environment for a request.
"""
- # This is a minimal valid WSGI environ dictionary, plus HTTP_COOKIE
- # for cookie support. Empty strings are omitted.
+ # This is a minimal valid WSGI environ dictionary, plus:
+ # - HTTP_COOKIE: for cookie support,
+ # - REMOTE_ADDR: often useful, see #8551.
# See http://www.python.org/dev/peps/pep-3333/#environ-variables
environ = {
'HTTP_COOKIE': self.cookies.output(header='', sep='; '),
+ 'PATH_INFO': '/',
+ 'REMOTE_ADDR': '127.0.0.1',
'REQUEST_METHOD': 'GET',
+ 'SCRIPT_NAME': '',
'SERVER_NAME': 'testserver',
'SERVER_PORT': '80',
'SERVER_PROTOCOL': 'HTTP/1.1',
@@ -994,3 +994,23 @@ def test_request_after_client(self):
def test_request_after_client_2(self):
# This test is executed after the previous one
self.common_test_that_should_always_pass()
+
+
+class RequestFactoryEnvironmentTests(TestCase):
+ """
+ Regression tests for #8551 and #17067: ensure that environment variables
+ are set correctly in RequestFactory.
+ """
+
+ def setUp(self):
+ self.factory = RequestFactory()
+
+ def test_should_set_correct_env_variables(self):
+ request = self.factory.get('/path/')
+
+ self.assertEqual(request.META.get('REMOTE_ADDR'), '127.0.0.1')
+ self.assertEqual(request.META.get('SERVER_NAME'), 'testserver')
+ self.assertEqual(request.META.get('SERVER_PORT'), '80')
+ self.assertEqual(request.META.get('SERVER_PROTOCOL'), 'HTTP/1.1')
+ self.assertEqual(request.META.get('SCRIPT_NAME') +
+ request.META.get('PATH_INFO'), '/path/')

0 comments on commit 14d24eb

Please sign in to comment.