more Windows fixups

Author: smurfix

tests/python/test_windows_events.py

@@ -1,5 +1,6 @@
 import os
 import sys
+import socket
 import unittest
 from unittest import mock
 
@@ -38,7 +39,7 @@ def setUp(self):
         self.set_event_loop(self.loop)
 
     def test_close(self):
-        a, b = self.loop._socketpair()
+        a, b = socket.socketpair()
         trans = self.loop._make_socket_transport(a, asyncio.Protocol())
         f = asyncio.ensure_future(self.loop.sock_recv(b, 100))
         trans.close()

tests/python/test_windows_utils.py

@@ -30,40 +30,18 @@ def check_winsocketpair(self, ssock, csock):
         ssock.close()
 
     def test_winsocketpair(self):
-        ssock, csock = windows_utils.socketpair()
+        ssock, csock = socket.socketpair()
         self.check_winsocketpair(ssock, csock)
 
     @unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 not supported or enabled')
     def test_winsocketpair_ipv6(self):
-        ssock, csock = windows_utils.socketpair(family=socket.AF_INET6)
+        ssock, csock = socket.socketpair(family=socket.AF_INET6)
         self.check_winsocketpair(ssock, csock)
 
-    @unittest.skipIf(hasattr(socket, 'socketpair'), 'socket.socketpair is available')
-    @mock.patch('asyncio.windows_utils.socket')
-    def test_winsocketpair_exc(self, m_socket):
-        m_socket.AF_INET = socket.AF_INET
-        m_socket.SOCK_STREAM = socket.SOCK_STREAM
-        m_socket.socket.return_value.getsockname.return_value = ('', 12345)
-        m_socket.socket.return_value.accept.return_value = object(), object()
-        m_socket.socket.return_value.connect.side_effect = OSError()
-
-        self.assertRaises(OSError, windows_utils.socketpair)
-
     def test_winsocketpair_invalid_args(self):
-        self.assertRaises(ValueError, windows_utils.socketpair, family=socket.AF_UNSPEC)
-        self.assertRaises(ValueError, windows_utils.socketpair, type=socket.SOCK_DGRAM)
-        self.assertRaises(ValueError, windows_utils.socketpair, proto=1)
-
-    @unittest.skipIf(hasattr(socket, 'socketpair'), 'socket.socketpair is available')
-    @mock.patch('asyncio.windows_utils.socket')
-    def test_winsocketpair_close(self, m_socket):
-        m_socket.AF_INET = socket.AF_INET
-        m_socket.SOCK_STREAM = socket.SOCK_STREAM
-        sock = mock.Mock()
-        m_socket.socket.return_value = sock
-        sock.bind.side_effect = OSError
-        self.assertRaises(OSError, windows_utils.socketpair)
-        self.assertTrue(sock.close.called)
+        self.assertRaises(ValueError, socket.socketpair, family=socket.AF_UNSPEC)
+        self.assertRaises(ValueError, socket.socketpair, type=socket.SOCK_DGRAM)
+        self.assertRaises(ValueError, socket.socketpair, proto=1)
 
 
 class PipeTests(unittest.TestCase):