From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 15 Jan 2013 09:08:30 +0000 (+0200)
Subject: Fix test_socket broken in previous commit (changeset 13e2e44db99d).
X-Git-Tag: v3.4.0a1~1605
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45cb7f6529ce55f9d942fe116495d17f1084a86d;p=python

Fix test_socket broken in previous commit (changeset 13e2e44db99d).
Added new checks for socket.setblocking().
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 282596f08e..53ad35d386 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