From: Brian Curtin <brian.curtin@gmail.com>
Date: Fri, 5 Nov 2010 15:47:45 +0000 (+0000)
Subject: Add socket cleanup for ResourceWarning and update test to use skip decorator
X-Git-Tag: v3.2a4~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ad0bd69c9b18e790074fc0643329383166d0eb5;p=python

Add socket cleanup for ResourceWarning and update test to use skip decorator
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index facb0651e5..57395b09d0 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -592,15 +592,15 @@ class GeneralModuleTests(unittest.TestCase):
         finally:
             sock.close()
 
+    @unittest.skipUnless(os.name == "nt", "Windows specific")
     def test_sock_ioctl(self):
-        if os.name != "nt":
-            return
         self.assertTrue(hasattr(socket.socket, 'ioctl'))
         self.assertTrue(hasattr(socket, 'SIO_RCVALL'))
         self.assertTrue(hasattr(socket, 'RCVALL_ON'))
         self.assertTrue(hasattr(socket, 'RCVALL_OFF'))
         self.assertTrue(hasattr(socket, 'SIO_KEEPALIVE_VALS'))
         s = socket.socket()
+        self.addCleanup(s.close)
         self.assertRaises(ValueError, s.ioctl, -1, None)
         s.ioctl(socket.SIO_KEEPALIVE_VALS, (1, 100, 100))