diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-10-24 20:07:08 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-10-24 20:07:08 -0700 |
| commit | 2775d85d55a092e3aca9a72bf2e5328d95b0340f (patch) | |
| tree | 573fbdfbdf1f2eebe412d73b8193b315777d8214 /Lib/test/test_socket.py | |
| parent | 0a467d1b8613edfff9f608da8622c716c882ac00 (diff) | |
| parent | d9dbf493837b798757ed68dbd97dd55cd0c6efa5 (diff) | |
| download | cpython-git-2775d85d55a092e3aca9a72bf2e5328d95b0340f.tar.gz | |
merge 3.4 (#25471)
Diffstat (limited to 'Lib/test/test_socket.py')
| -rw-r--r-- | Lib/test/test_socket.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 17819f2fd1..63cc284eb3 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -3866,6 +3866,7 @@ class NonBlockingTCPTests(ThreadedTCPSocketTest): read, write, err = select.select([self.serv], [], []) if self.serv in read: conn, addr = self.serv.accept() + self.assertIsNone(conn.gettimeout()) conn.close() else: self.fail("Error trying to do accept after select.") |