Merged revisions 76036 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76036 | antoine.pitrou | 2009-11-01 22:43:20 +0100 (dim., 01 nov. 2009) | 9 lines

  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 f92a7144861b606353a6fc5c708091d17a468fb4..dbe1a11a14a1fa15ede9df219894d15296a748f5 100644 (file)
--- a/Lib/test/test_normalization.py
+++ b/Lib/test/test_normalization.py
@@ -40,6 +40,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]
@@ -95,8 +100,6 @@ class NormalizationTest(unittest.TestCase):
 
 
 def test_main():
-    # Hit the exception early
-    open_urlresource(TESTDATAURL)
     run_unittest(NormalizationTest)
 
 if __name__ == "__main__":