From f8e4e4a935512aedf815f6aee85bc797b498ea75 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 23 Jan 2015 09:05:46 +0100 Subject: [PATCH] Fixed warning leak in static.serve() test Partial forward port of b1bf8d64fb from 1.7.x. Refs #24193. --- docs/releases/1.7.4.txt | 3 +++ tests/view_tests/tests/test_static.py | 1 + 2 files changed, 4 insertions(+) diff --git a/docs/releases/1.7.4.txt b/docs/releases/1.7.4.txt index 5f10e5e8c6..0d53459068 100644 --- a/docs/releases/1.7.4.txt +++ b/docs/releases/1.7.4.txt @@ -17,3 +17,6 @@ Bugfixes * Fixed a migration crash on MySQL when migrating from a ``OneToOneField`` to a ``ForeignKey`` (:ticket:`24163`). + +* Prevented the ``static.serve`` view from producing ``ResourceWarning``\s in + certain circumstances (security fix regression, :ticket:`24193`). diff --git a/tests/view_tests/tests/test_static.py b/tests/view_tests/tests/test_static.py index 808c07d605..5a353806e1 100644 --- a/tests/view_tests/tests/test_static.py +++ b/tests/view_tests/tests/test_static.py @@ -38,6 +38,7 @@ class StaticTests(SimpleTestCase): first_chunk = next(response.streaming_content) self.assertEqual(len(first_chunk), FileResponse.block_size) second_chunk = next(response.streaming_content) + response.close() # strip() to prevent OS line endings from causing differences self.assertEqual(len(second_chunk.strip()), 1449)