Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #8646 -- Modified test client to set a fully WSGI compliant env…

…ironment. Thanks to Adam Lofts for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9396 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit ecc1ed4ce1faa0b052ddd31487d24a4f9f9ea37a 1 parent cb6a588
@freakboy3742 freakboy3742 authored
Showing with 12 additions and 7 deletions.
  1. +12 −7 django/test/client.py
View
19 django/test/client.py
@@ -158,6 +158,7 @@ def __init__(self, **defaults):
self.defaults = defaults
self.cookies = SimpleCookie()
self.exc_info = None
+ self.errors = StringIO()
def store_exc_info(self, **kwargs):
"""
@@ -193,6 +194,12 @@ def request(self, **request):
'SERVER_NAME': 'testserver',
'SERVER_PORT': '80',
'SERVER_PROTOCOL': 'HTTP/1.1',
+ 'wsgi.version': (1,0),
+ 'wsgi.url_scheme': 'http',
+ 'wsgi.errors': self.errors,
+ 'wsgi.multiprocess': True,
+ 'wsgi.multithread': False,
+ 'wsgi.run_once': False,
}
environ.update(self.defaults)
environ.update(request)
@@ -254,11 +261,11 @@ def get(self, path, data={}, **extra):
Requests a response from the server using GET.
"""
r = {
- 'CONTENT_LENGTH': None,
'CONTENT_TYPE': 'text/html; charset=utf-8',
'PATH_INFO': urllib.unquote(path),
'QUERY_STRING': urlencode(data, doseq=True),
'REQUEST_METHOD': 'GET',
+ 'wsgi.input': FakePayload('')
}
r.update(extra)
@@ -289,11 +296,11 @@ def head(self, path, data={}, **extra):
Request a response from the server using HEAD.
"""
r = {
- 'CONTENT_LENGTH': None,
'CONTENT_TYPE': 'text/html; charset=utf-8',
'PATH_INFO': urllib.unquote(path),
'QUERY_STRING': urlencode(data, doseq=True),
'REQUEST_METHOD': 'HEAD',
+ 'wsgi.input': FakePayload('')
}
r.update(extra)
@@ -304,11 +311,10 @@ def options(self, path, data={}, **extra):
Request a response from the server using OPTIONS.
"""
r = {
- 'CONTENT_LENGTH': None,
- 'CONTENT_TYPE': None,
'PATH_INFO': urllib.unquote(path),
'QUERY_STRING': urlencode(data, doseq=True),
'REQUEST_METHOD': 'OPTIONS',
+ 'wsgi.input': FakePayload('')
}
r.update(extra)
@@ -338,11 +344,10 @@ def delete(self, path, data={}, **extra):
Send a DELETE request to the server.
"""
r = {
- 'CONTENT_LENGTH': None,
- 'CONTENT_TYPE': None,
'PATH_INFO': urllib.unquote(path),
'REQUEST_METHOD': 'DELETE',
- }
+ 'wsgi.input': FakePayload('')
+ }
r.update(extra)
return self.request(**r)
Please sign in to comment.
Something went wrong with that request. Please try again.