Skip to content

Commit 07aeb74

Browse files
authoredJul 17, 2022
gh-72889: Remove redundant mock.Mock()._is_coroutine = False workarounds (#94926)
1 parent 044a593 commit 07aeb74

File tree

3 files changed

+0
-13
lines changed

3 files changed

+0
-13
lines changed
 

‎Lib/test/test_asyncio/test_base_events.py

-10
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ def mock_socket_module():
4040

4141
m_socket.socket = mock.MagicMock()
4242
m_socket.socket.return_value = test_utils.mock_nonblocking_socket()
43-
m_socket.getaddrinfo._is_coroutine = False
4443

4544
return m_socket
4645

@@ -1286,9 +1285,7 @@ def _test_create_connection_ip_addr(self, m_socket, allow_inet_pton):
12861285
sock = m_socket.socket.return_value
12871286

12881287
self.loop._add_reader = mock.Mock()
1289-
self.loop._add_reader._is_coroutine = False
12901288
self.loop._add_writer = mock.Mock()
1291-
self.loop._add_writer._is_coroutine = False
12921289

12931290
coro = self.loop.create_connection(asyncio.Protocol, '1.2.3.4', 80)
12941291
t, p = self.loop.run_until_complete(coro)
@@ -1330,9 +1327,7 @@ def test_create_connection_ipv6_scope(self, m_socket):
13301327
sock.family = socket.AF_INET6
13311328

13321329
self.loop._add_reader = mock.Mock()
1333-
self.loop._add_reader._is_coroutine = False
13341330
self.loop._add_writer = mock.Mock()
1335-
self.loop._add_writer._is_coroutine = False
13361331

13371332
coro = self.loop.create_connection(asyncio.Protocol, 'fe80::1%1', 80)
13381333
t, p = self.loop.run_until_complete(coro)
@@ -1359,9 +1354,7 @@ def test_create_connection_service_name(self, m_socket):
13591354
sock = m_socket.socket.return_value
13601355

13611356
self.loop._add_reader = mock.Mock()
1362-
self.loop._add_reader._is_coroutine = False
13631357
self.loop._add_writer = mock.Mock()
1364-
self.loop._add_writer._is_coroutine = False
13651358

13661359
for service, port in ('http', 80), (b'http', 80):
13671360
coro = self.loop.create_connection(asyncio.Protocol,
@@ -1590,7 +1583,6 @@ class Err(OSError):
15901583

15911584
m_socket.getaddrinfo.return_value = [
15921585
(2, 1, 6, '', ('127.0.0.1', 10100))]
1593-
m_socket.getaddrinfo._is_coroutine = False
15941586
m_sock = m_socket.socket.return_value = mock.Mock()
15951587
m_sock.bind.side_effect = Err
15961588

@@ -1601,7 +1593,6 @@ class Err(OSError):
16011593
@patch_socket
16021594
def test_create_datagram_endpoint_no_addrinfo(self, m_socket):
16031595
m_socket.getaddrinfo.return_value = []
1604-
m_socket.getaddrinfo._is_coroutine = False
16051596

16061597
coro = self.loop.create_datagram_endpoint(
16071598
MyDatagramProto, local_addr=('localhost', 0))
@@ -1835,7 +1826,6 @@ def getaddrinfo(*args, **kw):
18351826
m_socket.getaddrinfo = getaddrinfo
18361827
m_socket.socket.return_value.bind = bind = mock.Mock()
18371828
self.loop._add_reader = mock.Mock()
1838-
self.loop._add_reader._is_coroutine = False
18391829

18401830
reuseport_supported = hasattr(socket, 'SO_REUSEPORT')
18411831
coro = self.loop.create_datagram_endpoint(

‎Lib/test/test_asyncio/test_selector_events.py

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ def setUp(self):
6161
def test_make_socket_transport(self):
6262
m = mock.Mock()
6363
self.loop.add_reader = mock.Mock()
64-
self.loop.add_reader._is_coroutine = False
6564
transport = self.loop._make_socket_transport(m, asyncio.Protocol())
6665
self.assertIsInstance(transport, _SelectorSocketTransport)
6766

‎Lib/test/test_asyncio/test_subprocess.py

-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ def setUp(self):
5050

5151
def create_transport(self, waiter=None):
5252
protocol = mock.Mock()
53-
protocol.connection_made._is_coroutine = False
54-
protocol.process_exited._is_coroutine = False
5553
transport = TestSubprocessTransport(
5654
self.loop, protocol, ['test'], False,
5755
None, None, None, 0, waiter=waiter)

0 commit comments

Comments
 (0)
Please sign in to comment.