[Python-checkins] cpython (3.2): Issue #10883: test_urllib2net closes socket explicitly

Fri Jun 17 14:53:39 CEST 2011

http://hg.python.org/cpython/rev/ca18f7f35c28
changeset: 70838:ca18f7f35c28
branch: 3.2
parent: 70835:ad6bdfd7dd4b
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Fri Jun 17 14:53:02 2011 +0200
summary:
 Issue #10883: test_urllib2net closes socket explicitly
files:
 Lib/test/test_urllib2net.py | 8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -234,6 +234,7 @@
 url = "http://www.python.org"
 with support.transient_internet(url, timeout=None):
 u = _urlopen_with_retry(url)
+ self.addCleanup(u.close)
 self.assertTrue(u.fp.raw._sock.gettimeout() is None)
 
 def test_http_default_timeout(self):
@@ -243,6 +244,7 @@
 socket.setdefaulttimeout(60)
 try:
 u = _urlopen_with_retry(url)
+ self.addCleanup(u.close)
 finally:
 socket.setdefaulttimeout(None)
 self.assertEqual(u.fp.raw._sock.gettimeout(), 60)
@@ -254,6 +256,7 @@
 socket.setdefaulttimeout(60)
 try:
 u = _urlopen_with_retry(url, timeout=None)
+ self.addCleanup(u.close)
 finally:
 socket.setdefaulttimeout(None)
 self.assertTrue(u.fp.raw._sock.gettimeout() is None)
@@ -262,6 +265,7 @@
 url = "http://www.python.org"
 with support.transient_internet(url):
 u = _urlopen_with_retry(url, timeout=120)
+ self.addCleanup(u.close)
 self.assertEqual(u.fp.raw._sock.gettimeout(), 120)
 
 FTP_HOST = "ftp://ftp.mirror.nl/pub/gnu/"
@@ -270,6 +274,7 @@
 self.assertTrue(socket.getdefaulttimeout() is None)
 with support.transient_internet(self.FTP_HOST, timeout=None):
 u = _urlopen_with_retry(self.FTP_HOST)
+ self.addCleanup(u.close)
 self.assertTrue(u.fp.fp.raw._sock.gettimeout() is None)
 
 def test_ftp_default_timeout(self):
@@ -278,6 +283,7 @@
 socket.setdefaulttimeout(60)
 try:
 u = _urlopen_with_retry(self.FTP_HOST)
+ self.addCleanup(u.close)
 finally:
 socket.setdefaulttimeout(None)
 self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60)
@@ -288,6 +294,7 @@
 socket.setdefaulttimeout(60)
 try:
 u = _urlopen_with_retry(self.FTP_HOST, timeout=None)
+ self.addCleanup(u.close)
 finally:
 socket.setdefaulttimeout(None)
 self.assertTrue(u.fp.fp.raw._sock.gettimeout() is None)
@@ -295,6 +302,7 @@
 def test_ftp_timeout(self):
 with support.transient_internet(self.FTP_HOST):
 u = _urlopen_with_retry(self.FTP_HOST, timeout=60)
+ self.addCleanup(u.close)
 self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60)
 
 
-- 
Repository URL: http://hg.python.org/cpython
