changeset:   81510:525407d89277
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Tue Jan 15 11:08:30 2013 +0200
files:       Lib/test/test_socket.py
description:
Fix test_socket broken in previous commit (changeset 13e2e44db99d).
Added new checks for socket.setblocking().


diff -r de719ed20c74 -r 525407d89277 Lib/test/test_socket.py
--- a/Lib/test/test_socket.py	Tue Jan 15 01:06:53 2013 +0000
+++ b/Lib/test/test_socket.py	Tue Jan 15 11:08:30 2013 +0200
@@ -3566,7 +3566,10 @@
 
     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 @@
         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