diff options
author | Christian Heimes <christian@python.org> | 2020-11-20 08:26:07 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-20 08:26:07 (GMT) |
commit | 03c8ddd9e94c7bddf1f06cf785027b8d2bf00ff0 (patch) | |
tree | e293c334cb6fee7b5826b21e26ab3c56a2d2fd20 /Lib/test/test_timeout.py | |
parent | 7ddbaa7a1b3e61847ee99658be6a7268a049e302 (diff) | |
download | cpython-03c8ddd9e94c7bddf1f06cf785027b8d2bf00ff0.zip cpython-03c8ddd9e94c7bddf1f06cf785027b8d2bf00ff0.tar.gz cpython-03c8ddd9e94c7bddf1f06cf785027b8d2bf00ff0.tar.bz2 |
bpo-42413: socket.timeout is now an alias of TimeoutError (GH-23413)
Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Lib/test/test_timeout.py')
-rw-r--r-- | Lib/test/test_timeout.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py index ac803f5..823d5c3 100644 --- a/Lib/test/test_timeout.py +++ b/Lib/test/test_timeout.py @@ -122,7 +122,7 @@ class TimeoutTestCase(unittest.TestCase): """ Test the specified socket method. - The method is run at most `count` times and must raise a socket.timeout + The method is run at most `count` times and must raise a TimeoutError within `timeout` + self.fuzz seconds. """ self.sock.settimeout(timeout) @@ -131,11 +131,11 @@ class TimeoutTestCase(unittest.TestCase): t1 = time.monotonic() try: method(*args) - except socket.timeout as e: + except TimeoutError as e: delta = time.monotonic() - t1 break else: - self.fail('socket.timeout was not raised') + self.fail('TimeoutError was not raised') # These checks should account for timing unprecision self.assertLess(delta, timeout + self.fuzz) self.assertGreater(delta, timeout - 1.0) @@ -204,7 +204,7 @@ class TCPTimeoutTestCase(TimeoutTestCase): sock.settimeout(timeout) try: sock.connect((whitehole)) - except socket.timeout: + except TimeoutError: pass except OSError as err: if err.errno == errno.ECONNREFUSED: |