diff options
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_socket.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_timeout.py | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index cbe1ec0..485e038 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -51,7 +51,10 @@ class ThreadableTest: self.queue = Queue.Queue(1) # Do some munging to start the client test. - test_method = getattr(self, '_' + self._TestCase__testMethodName) + methodname = self.id() + i = methodname.rfind('.') + methodname = methodname[i+1:] + test_method = getattr(self, '_' + methodname) self.client_thread = thread.start_new_thread( self.clientRun, (test_method,)) diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py index 8a84258..7c72222 100644 --- a/Lib/test/test_timeout.py +++ b/Lib/test/test_timeout.py @@ -59,17 +59,17 @@ class CreationTestCase(unittest.TestCase): self.assertRaises(ValueError, self.sock.settimeout, -1L) self.assertRaises(ValueError, self.sock.settimeout, -1.0) - def testTimeoutThenoBlocking(self): + def testTimeoutThenBlocking(self): "Test settimeout() followed by setblocking()" self.sock.settimeout(10) self.sock.setblocking(1) self.assertEqual(self.sock.gettimeout(), None) self.sock.setblocking(0) - self.assertEqual(self.sock.gettimeout(), None) + self.assertEqual(self.sock.gettimeout(), 0.0) self.sock.settimeout(10) self.sock.setblocking(0) - self.assertEqual(self.sock.gettimeout(), None) + self.assertEqual(self.sock.gettimeout(), 0.0) self.sock.setblocking(1) self.assertEqual(self.sock.gettimeout(), None) |