[Python-checkins] r86152 - in python/branches/release31-maint: Lib/test/test_socket.py

[brian.curtin]

Author: brian.curtin
Date: Thu Nov  4 04:49:29 2010
New Revision: 86152

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

........
  r86151 | brian.curtin | 2010-11-03 22:41:43 -0500 (Wed, 03 Nov 2010) | 3 lines
  
  Fix three ResourceWarnings.
  Mimic the clientTearDown from ThreadedTCPSocketTest, closing the socket.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_socket.py

Modified: python/branches/release31-maint/Lib/test/test_socket.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_socket.py	(original)
+++ python/branches/release31-maint/Lib/test/test_socket.py	Thu Nov  4 04:49:29 2010
@@ -177,6 +177,11 @@
     def clientSetUp(self):
         self.cli = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
+    def clientTearDown(self):
+        self.cli.close()
+        self.cli = None
+        ThreadableTest.clientTearDown(self)
+
 class SocketConnectedTest(ThreadedTCPSocketTest):
     """Socket tests for client-server connection.