From a0f8c52ae2a9ac211742b4dd7b7e9777040b076c Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Mon, 5 Jun 2017 06:56:51 -0700 Subject: [PATCH] Fixed ResourceWarnings in tests/servers/tests.py. e.g. ResourceWarning: unclosed --- tests/servers/tests.py | 5 ++++- tests/servers/views.py | 11 ++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/servers/tests.py b/tests/servers/tests.py index e7b263c088..410d180596 100644 --- a/tests/servers/tests.py +++ b/tests/servers/tests.py @@ -69,6 +69,7 @@ class LiveServerViews(LiveServerBase): def test_404(self): with self.assertRaises(HTTPError) as err: self.urlopen('/') + err.exception.close() self.assertEqual(err.exception.code, 404, 'Expected 404 response') def test_view(self): @@ -87,6 +88,7 @@ class LiveServerViews(LiveServerBase): """ with self.assertRaises(HTTPError) as err: self.urlopen('/static/another_app/another_app_static_file.txt') + err.exception.close() self.assertEqual(err.exception.code, 404, 'Expected 404 response') def test_media_files(self): @@ -111,7 +113,8 @@ class LiveServerDatabase(LiveServerBase): """ Data written to the database by a view can be read. """ - self.urlopen('/create_model_instance/') + with self.urlopen('/create_model_instance/'): + pass self.assertQuerysetEqual( Person.objects.all().order_by('pk'), ['jane', 'robert', 'emily'], diff --git a/tests/servers/views.py b/tests/servers/views.py index 3fa99380b1..3bae0834ab 100644 --- a/tests/servers/views.py +++ b/tests/servers/views.py @@ -29,11 +29,12 @@ def subview(request): def subview_calling_view(request): - response = urlopen(request.GET['url'] + '/subview/') - return HttpResponse('subview calling view: {}'.format(response.read().decode())) + with urlopen(request.GET['url'] + '/subview/') as response: + return HttpResponse('subview calling view: {}'.format(response.read().decode())) def check_model_instance_from_subview(request): - urlopen(request.GET['url'] + '/create_model_instance/') - response = urlopen(request.GET['url'] + '/model_view/') - return HttpResponse('subview calling view: {}'.format(response.read().decode())) + with urlopen(request.GET['url'] + '/create_model_instance/'): + pass + with urlopen(request.GET['url'] + '/model_view/') as response: + return HttpResponse('subview calling view: {}'.format(response.read().decode()))