From: Brian Curtin <brian.curtin@gmail.com>
Date: Sun, 31 Oct 2010 00:36:01 +0000 (+0000)
Subject: Merged revisions 86006 via svnmerge from
X-Git-Tag: v2.7.1rc1~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55b6251c9dcb86d1d4f837b0b521f65ab4a268fe;p=python

Merged revisions 86006 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86006 | brian.curtin | 2010-10-30 19:34:23 -0500 (Sat, 30 Oct 2010) | 3 lines

  Fix ResourceWarning for an unclosed socket.
  test_return_header_keep_alive - Added a cleanup call for the socket.
........
---

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index a00c5f2171..7dee6f5e8a 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -256,6 +256,7 @@ class BaseHTTPServerTestCase(BaseTestCase):
         res = self.con.getresponse()
         self.assertEqual(res.getheader('Connection'), 'keep-alive')
         self.con.request('TEST', '/')
+        self.addCleanup(self.con.close)
 
     def test_internal_key_error(self):
         self.con.request('KEYERROR', '/')