summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-01-15 09:08:30 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-01-15 09:08:30 (GMT)
commit45cb7f6529ce55f9d942fe116495d17f1084a86d (patch)
tree4f3f7941bd759d1c1cba04f6c3d5520762a3ccc1 /Lib
parentdf20b51dffa6a0290ee6e1eb5e4cde45d6c90b42 (diff)
downloadcpython-45cb7f6529ce55f9d942fe116495d17f1084a86d.zip
cpython-45cb7f6529ce55f9d942fe116495d17f1084a86d.tar.gz
cpython-45cb7f6529ce55f9d942fe116495d17f1084a86d.tar.bz2
Fix test_socket broken in previous commit (changeset 13e2e44db99d).
Added new checks for socket.setblocking().
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_socket.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 282596f..53ad35d 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -3566,7 +3566,10 @@ class NonBlockingTCPTests(ThreadedTCPSocketTest):
def testSetBlocking(self):
# Testing whether set blocking works
- self.serv.setblocking(0)
+ self.serv.setblocking(True)
+ self.assertIsNone(self.serv.gettimeout())
+ self.serv.setblocking(False)
+ self.assertEqual(self.serv.gettimeout(), 0.0)
start = time.time()
try:
self.serv.accept()
@@ -3575,10 +3578,9 @@ class NonBlockingTCPTests(ThreadedTCPSocketTest):
end = time.time()
self.assertTrue((end - start) < 1.0, "Error setting non-blocking mode.")
# Issue 15989
- self.assertRaises(OverflowError, self.serv.setblocking,
- _testcapi.INT_MAX + 1)
- self.assertRaises(OverflowError, self.serv.setblocking,
- _testcapi.UINT_MAX + 1)
+ if _testcapi.UINT_MAX < _testcapi.ULONG_MAX:
+ self.serv.setblocking(_testcapi.UINT_MAX + 1)
+ self.assertIsNone(self.serv.gettimeout())
def _testSetBlocking(self):
pass