Skip to content

bpo-29970: Make ssh_handshake_timeout None by default #4939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asvetlov merged 7 commits into from
Dec 20, 2017
Merged

bpo-29970: Make ssh_handshake_timeout None by default #4939

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a4b641c
Make ssh_handshake_timeout None by default.
asvetlov Dec 20, 2017
2bf9800
Add tests
asvetlov Dec 20, 2017
b6b28f8
Fix typo
asvetlov Dec 20, 2017
099cf5f
Raise ValueError if ssl_handshake_timeout<=0
asvetlov Dec 20, 2017
2f76ef9
Merge branch 'master' into ssl_handshake_timeout
asvetlov Dec 20, 2017
67a2b9f
Fix resource warning
asvetlov Dec 20, 2017
81daa60
assertRaises -> asserRaisesRegex
asvetlov Dec 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix resource warning
  • Loading branch information
@asvetlov
asvetlov committed Dec 20, 2017
commit 67a2b9f002a55975afac69d0d6ce84a3926e39ec
1 change: 1 addition & 0 deletions Lib/test/test_asyncio/test_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,7 @@ def test_ssl_connect_accepted_socket(self):

def test_connect_accepted_socket_ssl_timeout_for_plain_socket(self):
sock = socket.socket()
self.addCleanup(sock.close)
coro = self.loop.connect_accepted_socket(
MyProto, sock, ssl_handshake_timeout=1)
self.assertRaises(ValueError, self.loop.run_until_complete, coro)
Expand Down