[3.6] bpo-29887: Test normalization now fails if download fails (GH-905) (#2271)

* test_normalization fails if download fails

bpo-29887. The test is still skipped if "-u urlfetch" option is not
passed to regrtest (python3 -m test -u urlfetch test_normalization).

* Fix ResourceWarning in test_normalization

bpo-29887: Fix ResourceWarning in test_normalization if tests are
interrupted by CTRL+c.
(cherry picked from commit 722a3af092)
This commit is contained in:
Mariatta 2017-06-19 04:22:54 -07:00 committed by Victor Stinner
parent ccc06d3270
commit 51f40a81a4
1 changed files with 9 additions and 4 deletions

View File

@ -36,15 +36,20 @@ def unistr(data):
class NormalizationTest(unittest.TestCase):
def test_main(self):
part = None
part1_data = {}
# Hit the exception early
try:
testdata = open_urlresource(TESTDATAURL, encoding="utf-8",
check=check_version)
except (OSError, HTTPException):
self.skipTest("Could not retrieve " + TESTDATAURL)
self.addCleanup(testdata.close)
self.fail(f"Could not retrieve {TESTDATAURL}")
with testdata:
self.run_normalization_tests(testdata)
def run_normalization_tests(self, testdata):
part = None
part1_data = {}
for line in testdata:
if '#' in line:
line = line.split('#')[0]