diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-10-25 03:07:28 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-10-25 03:07:28 (GMT) |
| commit | 2374ad7dd90218f36144224dd2a78bbe1d739f5c (patch) | |
| tree | dbf2501e79d1cd44636621bb0d6358a0bfdd044d /Lib/test/test_socket.py | |
| parent | b75e7f52698ff85b438ac3c8241b7b867213c99b (diff) | |
| parent | 2775d85d55a092e3aca9a72bf2e5328d95b0340f (diff) | |
| download | cpython-2374ad7dd90218f36144224dd2a78bbe1d739f5c.zip cpython-2374ad7dd90218f36144224dd2a78bbe1d739f5c.tar.gz cpython-2374ad7dd90218f36144224dd2a78bbe1d739f5c.tar.bz2 | |
merge 3.5 (#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 17819f2..63cc284 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.") |