Ticket #15762: patch_test_client_wsgi_input.diff

tests/regressiontests/test_client_regress/views.py

@@ -96 +96 @@
     "A view that is requested with GET and accesses request.raw_post_data. Refs #14753."
     return HttpResponse(request.raw_post_data)
 
+def read_limited_stream(request):
+    "A view that is requested with PUT and accesses request.read(LARGE_BUFFER)."
+    return HttpResponse(request.read(99999))
+
 def request_context_view(request):
     # Special attribute that won't be present on a plain HttpRequest
     request.special_path = request.path

tests/regressiontests/test_client_regress/models.py

@@ -908 +908 @@
             response = self.client.get("/test_client_regress/raw_post_data/")
         except AssertionError:
             self.fail("Accessing request.raw_post_data from a view fetched with GET by the test client shouldn't fail.")
+
+class ReadLimitedStreamTest(TestCase):
+    """
+    Attempting to read beyond META["CONTENT_LENGTH"] from the test client
+    should simply return the full content of the request.
+    """
+    def test_read_limited_stream(self):
+        try:
+            response = self.client.put("/test_client_regress/read_limited_stream/", data={'foo':'whiz'})
+        except AssertionError:
+            self.fail("Reading more than META['CONTENT_LENGTH'] of data from a view fetched with PUT by the test client " +
+                      "shouldn't fail, it should simply return the full content of the request.")        

tests/regressiontests/test_client_regress/urls.py

@@ -27 +27 @@
     (r'^check_headers/$', views.check_headers),
     (r'^check_headers_redirect/$', RedirectView.as_view(url='/test_client_regress/check_headers/')),
     (r'^raw_post_data/$', views.raw_post_data),
+    (r'^read_limited_stream/$', views.read_limited_stream),
     (r'^request_context_view/$', views.request_context_view),
 )

django/test/client.py

@@ -26 +26 @@
 from django.utils.itercompat import is_iterable
 from django.db import transaction, close_connection
 from django.test.utils import ContextList
+import socket
 
 __all__ = ('Client', 'RequestFactory', 'encode_file', 'encode_multipart')
 
@@ -34 +35 @@
 MULTIPART_CONTENT = 'multipart/form-data; boundary=%s' % BOUNDARY
 CONTENT_TYPE_RE = re.compile('.*; charset=([\w\d-]+);?')
 
-class FakePayload(object):
+class FakePayload(socket._fileobject):
     """
     A wrapper around StringIO that restricts what can be read since data from
     the network can't be seeked and cannot be read outside of its content
     length. This makes sure that views can't do anything under the test client
     that wouldn't work in Real Life.
+
+    We fake this up as a socket._fileobject, so that the WSGIrequest wraps it
+    up in a LimitedStream as it would do for any WSGI stream that hasn't
+    already defined it's own .read()/.readlines() implementations. 
     """
     def __init__(self, content):
         self.__content = StringIO(content)