[Python-checkins] cpython (merge 3.4 -> 3.4): Merge heads

Tue Oct 6 11:54:19 EDT 2015

https://hg.python.org/cpython/rev/91f36d2b097a
changeset: 98559:91f36d2b097a
branch: 3.4
parent: 98556:d272f3cbae05
parent: 98552:aebbf205ef6f
user: Serhiy Storchaka <storchaka at gmail.com>
date: Tue Oct 06 18:38:25 2015 +0300
summary:
 Merge heads
files:
 Lib/test/test_asyncio/test_base_events.py | 5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -1215,6 +1215,7 @@
 
 def test_create_datagram_endpoint_sock(self):
 sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+ sock.bind(('127.0.0.1', 0))
 fut = self.loop.create_datagram_endpoint(
 lambda: MyDatagramProto(create_future=True, loop=self.loop),
 sock=sock)
@@ -1307,10 +1308,6 @@
 self.assertTrue(
 sock.getsockopt(
 socket.SOL_SOCKET, socket.SO_REUSEPORT))
- else:
- self.assertFalse(
- sock.getsockopt(
- socket.SOL_SOCKET, socket.SO_REUSEPORT))
 self.assertTrue(
 sock.getsockopt(
 socket.SOL_SOCKET, socket.SO_BROADCAST))
-- 
Repository URL: https://hg.python.org/cpython
