Commit cecbed5a authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Fixed #8646 -- Modified test client to set a fully WSGI compliant... 

[1.0.X] Fixed #8646 -- Modified test client to set a fully WSGI compliant environment. Thanks to Adam Lofts for the report.

Merge from trunk of [9396]


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 7a142118

django/test/client.py

+8 −1
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ class Client(object): 
        self.defaults = defaults

        self.cookies = SimpleCookie()

        self.exc_info = None

        self.errors = StringIO()



    def store_exc_info(self, **kwargs):

        """
@@ -193,6 +194,12 @@ class Client(object): 
            '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 @@ class Client(object): 
        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)