summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortwisteroid ambassador <twisteroidambassador@users.noreply.github.com>2018-07-30 18:58:50 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2018-07-30 18:58:50 (GMT)
commit9045199c5aaeac9b52537581be127d999b5944ee (patch)
tree36e2ab26c69d390c0ec86edfb7612a98d9dbe8c9
parent6921ef7bef4eab3819b3d0fda5fa3e3b2a8c0613 (diff)
downloadcpython-9045199c5aaeac9b52537581be127d999b5944ee.zip
cpython-9045199c5aaeac9b52537581be127d999b5944ee.tar.gz
cpython-9045199c5aaeac9b52537581be127d999b5944ee.tar.bz2
bpo-33833: Fix ProactorSocketTransport AssertionError (#7893)
-rw-r--r--Lib/asyncio/proactor_events.py4
-rw-r--r--Lib/test/test_asyncio/test_proactor_events.py13
-rw-r--r--Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst2
3 files changed, 19 insertions, 0 deletions
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index 6d230a2..66bfb0a 100644
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -343,6 +343,10 @@ class _ProactorBaseWritePipeTransport(_ProactorBasePipeTransport,
def _loop_writing(self, f=None, data=None):
try:
+ if f is not None and self._write_fut is None and self._closing:
+ # XXX most likely self._force_close() has been called, and
+ # it has set self._write_fut to None.
+ return
assert f is self._write_fut
self._write_fut = None
self._pending_write = 0
diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py
index ac52941..dddbe3b 100644
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -257,6 +257,19 @@ class ProactorSocketTransportTests(test_utils.TestCase):
self.assertEqual(None, tr._buffer)
self.assertEqual(tr._conn_lost, 1)
+ def test_loop_writing_force_close(self):
+ exc_handler = mock.Mock()
+ self.loop.set_exception_handler(exc_handler)
+ fut = asyncio.Future(loop=self.loop)
+ fut.set_result(1)
+ self.proactor.send.return_value = fut
+
+ tr = self.socket_transport()
+ tr.write(b'data')
+ tr._force_close(None)
+ test_utils.run_briefly(self.loop)
+ exc_handler.assert_not_called()
+
def test_force_close_idempotent(self):
tr = self.socket_transport()
tr._closing = True
diff --git a/Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst b/Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst
new file mode 100644
index 0000000..1a7672f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-06-17-11-46-20.bpo-33833.RnEqvM.rst
@@ -0,0 +1,2 @@
+Fixed bug in asyncio where ProactorSocketTransport logs AssertionError if
+force closed during write.