(original) (raw)

changeset: 103300:46b34706eb41 user: Christian Heimes christian@python.org date: Thu Sep 08 10:53:40 2016 +0200 files: Lib/test/test_hashlib.py description: Issue 26798: fetch OSError and HTTPException like other tests that use open_urlresource. diff -r 368e0cfa5691 -r 46b34706eb41 Lib/test/test_hashlib.py --- a/Lib/test/test_hashlib.py Thu Sep 08 01:33:43 2016 -0700 +++ b/Lib/test/test_hashlib.py Thu Sep 08 10:53:40 2016 +0200 @@ -20,6 +20,7 @@ import warnings from test import support from test.support import _4G, bigmemtest, import_fresh_module +from http.client import HTTPException # Were we compiled --with-pydebug or with #define Py_DEBUG? COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount') @@ -54,8 +55,13 @@ URL = "http://www.pythontest.net/hashlib/{}.txt" def read_vectors(hash_name): - with support.open_urlresource(URL.format(hash_name)) as f: - for line in f: + url = URL.format(hash_name) + try: + testdata = support.open_urlresource(url) + except (OSError, HTTPException): + raise unittest.SkipTest("Could not retrieve {}".format(url)) + with testdata: + for line in testdata: line = line.strip() if line.startswith('#') or not line: continue /christian@python.org