Merge 3.5 (Issue #23630, fix test_asyncio)

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 34881016891b995e8a1703ae483cb2b182f14230..9801d22223b0e530ca0f2f876a30c64c1f7b420f 100644 (file)
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -764,6 +764,7 @@ class EventLoopTestsMixin:
                                                             for host in hosts]
         self.loop.getaddrinfo = getaddrinfo_task
         self.loop._start_serving = mock.Mock()
+        self.loop._stop_serving = mock.Mock()
         f = self.loop.create_server(lambda: MyProto(self.loop), hosts, 80)
         server = self.loop.run_until_complete(f)
         self.addCleanup(server.close)