[Python-checkins] cpython (merge 3.4 -> 3.5): Merge 3.4 (Issue #23630, fix test_asyncio)

Mon Sep 21 22:32:25 CEST 2015

https://hg.python.org/cpython/rev/840942a3f6aa
changeset: 98146:840942a3f6aa
branch: 3.5
parent: 98143:09d27433983f
parent: 98145:42e7334e0e4c
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Sep 21 22:29:30 2015 +0200
summary:
 Merge 3.4 (Issue #23630, fix test_asyncio)
files:
 Lib/test/test_asyncio/test_events.py | 1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -764,6 +764,7 @@
 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)
-- 
Repository URL: https://hg.python.org/cpython
