summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Grainger <tagrain@gmail.com>2022-07-17 17:21:58 (GMT)
committerGitHub <noreply@github.com>2022-07-17 17:21:58 (GMT)
commit07aeb7405ea42729b95ecae225f1d96a4aea5121 (patch)
treec561f2a521e2f3d457dc4e122821f85c58c6239b
parent044a593cbbe1639e906e06c47504dd1020ddfee4 (diff)
downloadcpython-07aeb7405ea42729b95ecae225f1d96a4aea5121.zip
cpython-07aeb7405ea42729b95ecae225f1d96a4aea5121.tar.gz
cpython-07aeb7405ea42729b95ecae225f1d96a4aea5121.tar.bz2
gh-72889: Remove redundant mock.Mock()._is_coroutine = False workarounds (#94926)
-rw-r--r--Lib/test/test_asyncio/test_base_events.py10
-rw-r--r--Lib/test/test_asyncio/test_selector_events.py1
-rw-r--r--Lib/test/test_asyncio/test_subprocess.py2
3 files changed, 0 insertions, 13 deletions
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index c6671bd..063174a 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -40,7 +40,6 @@ def mock_socket_module():
m_socket.socket = mock.MagicMock()
m_socket.socket.return_value = test_utils.mock_nonblocking_socket()
- m_socket.getaddrinfo._is_coroutine = False
return m_socket
@@ -1286,9 +1285,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
sock = m_socket.socket.return_value
self.loop._add_reader = mock.Mock()
- self.loop._add_reader._is_coroutine = False
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)
t, p = self.loop.run_until_complete(coro)
@@ -1330,9 +1327,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
sock.family = socket.AF_INET6
self.loop._add_reader = mock.Mock()
- self.loop._add_reader._is_coroutine = False
self.loop._add_writer = mock.Mock()
- self.loop._add_writer._is_coroutine = False
coro = self.loop.create_connection(asyncio.Protocol, 'fe80::1%1', 80)
t, p = self.loop.run_until_complete(coro)
@@ -1359,9 +1354,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
sock = m_socket.socket.return_value
self.loop._add_reader = mock.Mock()
- self.loop._add_reader._is_coroutine = False
self.loop._add_writer = mock.Mock()
- self.loop._add_writer._is_coroutine = False
for service, port in ('http', 80), (b'http', 80):
coro = self.loop.create_connection(asyncio.Protocol,
@@ -1590,7 +1583,6 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
m_socket.getaddrinfo.return_value = [
(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.bind.side_effect = Err
@@ -1601,7 +1593,6 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
@patch_socket
def test_create_datagram_endpoint_no_addrinfo(self, m_socket):
m_socket.getaddrinfo.return_value = []
- m_socket.getaddrinfo._is_coroutine = False
coro = self.loop.create_datagram_endpoint(
MyDatagramProto, local_addr=('localhost', 0))
@@ -1835,7 +1826,6 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
m_socket.getaddrinfo = getaddrinfo
m_socket.socket.return_value.bind = bind = mock.Mock()
self.loop._add_reader = mock.Mock()
- self.loop._add_reader._is_coroutine = False
reuseport_supported = hasattr(socket, 'SO_REUSEPORT')
coro = self.loop.create_datagram_endpoint(
diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
index d9d30fc..22dcfb2 100644
--- a/Lib/test/test_asyncio/test_selector_events.py
+++ b/Lib/test/test_asyncio/test_selector_events.py
@@ -61,7 +61,6 @@ class BaseSelectorEventLoopTests(test_utils.TestCase):
def test_make_socket_transport(self):
m = mock.Mock()
self.loop.add_reader = mock.Mock()
- self.loop.add_reader._is_coroutine = False
transport = self.loop._make_socket_transport(m, asyncio.Protocol())
self.assertIsInstance(transport, _SelectorSocketTransport)
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index 09a5c39..305330a 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -50,8 +50,6 @@ class SubprocessTransportTests(test_utils.TestCase):
def create_transport(self, waiter=None):
protocol = mock.Mock()
- protocol.connection_made._is_coroutine = False
- protocol.process_exited._is_coroutine = False
transport = TestSubprocessTransport(
self.loop, protocol, ['test'], False,
None, None, None, 0, waiter=waiter)