mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gh-72889: Remove redundant mock.Mock()._is_coroutine = False workarounds (GH-94926)

Browse source 
(cherry picked from commit 07aeb7405e)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
This commit is contained in:
Miss Islington (bot) 2022-07-17 10:49:01 -07:00 • committed by GitHub
parent 1c63734217
commit 8d0249e345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_asyncio/test_base_events.py
View file

@ -40,7 +40,6 @@ def mock_socket_module():
m_socket.socket = mock.MagicMock() m_socket.socket = mock.MagicMock()
m_socket.socket.return_value = test_utils.mock_nonblocking_socket() m_socket.socket.return_value = test_utils.mock_nonblocking_socket()
m_socket.getaddrinfo._is_coroutine = False
return m_socket return m_socket
@ -1286,9 +1285,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
sock = m_socket.socket.return_value sock = m_socket.socket.return_value
self.loop._add_reader = mock.Mock() self.loop._add_reader = mock.Mock()
self.loop._add_reader._is_coroutine = False
self.loop._add_writer = mock.Mock() self.loop._add_writer = mock.Mock()
self.loop._add_writer._is_coroutine = False
coro = self.loop.create_connection(asyncio.Protocol, '1.2.3.4', 80) coro = self.loop.create_connection(asyncio.Protocol, '1.2.3.4', 80)
t, p = self.loop.run_until_complete(coro) t, p = self.loop.run_until_complete(coro)
@ -1330,9 +1327,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
sock.family = socket.AF_INET6 sock.family = socket.AF_INET6
self.loop._add_reader = mock.Mock() self.loop._add_reader = mock.Mock()
self.loop._add_reader._is_coroutine = False
self.loop._add_writer = mock.Mock() self.loop._add_writer = mock.Mock()
self.loop._add_writer._is_coroutine = False
coro = self.loop.create_connection(asyncio.Protocol, 'fe80::1%1', 80) coro = self.loop.create_connection(asyncio.Protocol, 'fe80::1%1', 80)
t, p = self.loop.run_until_complete(coro) t, p = self.loop.run_until_complete(coro)
@ -1359,9 +1354,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
sock = m_socket.socket.return_value sock = m_socket.socket.return_value
self.loop._add_reader = mock.Mock() self.loop._add_reader = mock.Mock()
self.loop._add_reader._is_coroutine = False
self.loop._add_writer = mock.Mock() self.loop._add_writer = mock.Mock()
self.loop._add_writer._is_coroutine = False
for service, port in ('http', 80), (b'http', 80): for service, port in ('http', 80), (b'http', 80):
coro = self.loop.create_connection(asyncio.Protocol, coro = self.loop.create_connection(asyncio.Protocol,
@ -1590,7 +1583,6 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
m_socket.getaddrinfo.return_value = [ m_socket.getaddrinfo.return_value = [
(2, 1, 6, '', ('127.0.0.1', 10100))] (2, 1, 6, '', ('127.0.0.1', 10100))]
m_socket.getaddrinfo._is_coroutine = False
m_sock = m_socket.socket.return_value = mock.Mock() m_sock = m_socket.socket.return_value = mock.Mock()
m_sock.bind.side_effect = Err m_sock.bind.side_effect = Err
@ -1601,7 +1593,6 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
@patch_socket @patch_socket
def test_create_datagram_endpoint_no_addrinfo(self, m_socket): def test_create_datagram_endpoint_no_addrinfo(self, m_socket):
m_socket.getaddrinfo.return_value = [] m_socket.getaddrinfo.return_value = []
m_socket.getaddrinfo._is_coroutine = False
coro = self.loop.create_datagram_endpoint( coro = self.loop.create_datagram_endpoint(
MyDatagramProto, local_addr=('localhost', 0)) MyDatagramProto, local_addr=('localhost', 0))
@ -1835,7 +1826,6 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
m_socket.getaddrinfo = getaddrinfo m_socket.getaddrinfo = getaddrinfo
m_socket.socket.return_value.bind = bind = mock.Mock() m_socket.socket.return_value.bind = bind = mock.Mock()
self.loop._add_reader = mock.Mock() self.loop._add_reader = mock.Mock()
self.loop._add_reader._is_coroutine = False
reuseport_supported = hasattr(socket, 'SO_REUSEPORT') reuseport_supported = hasattr(socket, 'SO_REUSEPORT')
coro = self.loop.create_datagram_endpoint( coro = self.loop.create_datagram_endpoint(

1
Lib/test/test_asyncio/test_selector_events.py
View file

@ -61,7 +61,6 @@ class BaseSelectorEventLoopTests(test_utils.TestCase):
def test_make_socket_transport(self): def test_make_socket_transport(self):
m = mock.Mock() m = mock.Mock()
self.loop.add_reader = mock.Mock() self.loop.add_reader = mock.Mock()
self.loop.add_reader._is_coroutine = False
transport = self.loop._make_socket_transport(m, asyncio.Protocol()) transport = self.loop._make_socket_transport(m, asyncio.Protocol())
self.assertIsInstance(transport, _SelectorSocketTransport) self.assertIsInstance(transport, _SelectorSocketTransport)

2
Lib/test/test_asyncio/test_subprocess.py
View file

@ -50,8 +50,6 @@ class SubprocessTransportTests(test_utils.TestCase):
def create_transport(self, waiter=None): def create_transport(self, waiter=None):
protocol = mock.Mock() protocol = mock.Mock()
protocol.connection_made._is_coroutine = False
protocol.process_exited._is_coroutine = False
transport = TestSubprocessTransport( transport = TestSubprocessTransport(
self.loop, protocol, ['test'], False, self.loop, protocol, ['test'], False,
None, None, None, 0, waiter=waiter) None, None, None, 0, waiter=waiter)