diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-07 21:22:56 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-07 21:22:56 (GMT) |
| commit | 4d7979be72ed728f3b334037d59a218314c28550 (patch) | |
| tree | 547e79227acbfbaa4733f7885977e8f6fa26f8a9 /Lib/test/test_ssl.py | |
| parent | 824cf253e5c5085be1e29b044b6e2c0cad872080 (diff) | |
| download | cpython-4d7979be72ed728f3b334037d59a218314c28550.zip cpython-4d7979be72ed728f3b334037d59a218314c28550.tar.gz cpython-4d7979be72ed728f3b334037d59a218314c28550.tar.bz2 | |
Merged revisions 84597-84599 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84597 | antoine.pitrou | 2010-09-07 22:42:19 +0200 (mar., 07 sept. 2010) | 5 lines
Issue #8574: better implementation of test.support.transient_internet().
Original patch by Victor.
........
r84598 | antoine.pitrou | 2010-09-07 23:05:49 +0200 (mar., 07 sept. 2010) | 6 lines
Issue #9792: In case of connection failure, socket.create_connection()
would swallow the exception and raise a new one, making it impossible
to fetch the original errno, or to filter timeout errors. Now the
original error is re-raised.
........
r84599 | antoine.pitrou | 2010-09-07 23:09:09 +0200 (mar., 07 sept. 2010) | 4 lines
Improve transient_internet() again to detect more network errors,
and use it in test_robotparser. Fixes #8574.
........
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 193978c..4904bda 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -218,10 +218,10 @@ class NetworkedTests(unittest.TestCase): # NOTE: https://sha256.tbs-internet.com is another possible test host remote = ("sha2.hboeck.de", 443) sha256_cert = os.path.join(os.path.dirname(__file__), "sha256.pem") - s = ssl.wrap_socket(socket.socket(socket.AF_INET), - cert_reqs=ssl.CERT_REQUIRED, - ca_certs=sha256_cert,) - with support.transient_internet(): + with support.transient_internet("sha2.hboeck.de"): + s = ssl.wrap_socket(socket.socket(socket.AF_INET), + cert_reqs=ssl.CERT_REQUIRED, + ca_certs=sha256_cert,) try: s.connect(remote) if support.verbose: |