Merged revisions 76033 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76033 | antoine.pitrou | 2009-11-01 22:26:14 +0100 (dim., 01 nov. 2009) | 3 lines

  test_normalization should skip and not crash when the resource isn't available
........

diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py
index 94d65b89dd506e568880685b176cde28a78f8cc7..664155473464e89b4e50e1a3e052cdaab4cd2f89 100644 (file)
--- a/Lib/test/test_normalization.py
+++ b/Lib/test/test_normalization.py
@@ -42,6 +42,11 @@ def unistr(data):
 class NormalizationTest(unittest.TestCase):
     def test_main(self):
         part1_data = {}
+        # Hit the exception early
+        try:
+            open_urlresource(TESTDATAURL, encoding="utf-8")
+        except IOError:
+            self.skipTest("Could not retrieve " + TESTDATAURL)
         for line in open_urlresource(TESTDATAURL, encoding="utf-8"):
             if '#' in line:
                 line = line.split('#')[0]
@@ -97,8 +102,6 @@ class NormalizationTest(unittest.TestCase):
 
 
 def test_main():
-    # Skip the test early if the 'urlfetch' resource is not enabled.
-    open_urlresource(TESTDATAURL)
     run_unittest(NormalizationTest)
 
 if __name__ == "__main__":