From f44aa34ceec6e6d068802946f759d2db4bdc1087 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 1 Nov 2009 16:17:06 +0000 Subject: [PATCH] (neither to 2.6) Merged revisions 76012 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76012 | antoine.pitrou | 2009-11-01 17:10:47 +0100 (dim., 01 nov. 2009) | 3 lines Hum, test skipping when the URL isn't reachable hadn't been applied to trunk. ........ --- Lib/test/test_multibytecodec_support.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py index 60557640be3..feefa9733e6 100644 --- a/Lib/test/test_multibytecodec_support.py +++ b/Lib/test/test_multibytecodec_support.py @@ -266,7 +266,10 @@ class TestBase_Mapping(unittest.TestCase): def __init__(self, *args, **kw): unittest.TestCase.__init__(self, *args, **kw) - self.open_mapping_file() # test it to report the error early + try: + self.open_mapping_file() # test it to report the error early + except IOError: + raise test_support.TestSkipped("Could not retrieve "+self.mapfileurl) def open_mapping_file(self): return test_support.open_urlresource(self.mapfileurl)