From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 1 Nov 2009 21:34:42 +0000 (+0000)
Subject: Merged revisions 76033 via svnmerge from
X-Git-Tag: v2.6.5rc1~393
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ccb66a5bd7360f9c7f123f6828a27aa244fd489;p=python

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 e9056cda0a..e4da01fe4c 100644
--- a/Lib/test/test_normalization.py
+++ b/Lib/test/test_normalization.py
@@ -1,4 +1,4 @@
-from test.test_support import run_unittest, open_urlresource
+from test.test_support import run_unittest, open_urlresource, TestSkipped
 import unittest
 
 import sys
@@ -96,7 +96,10 @@ class NormalizationTest(unittest.TestCase):
 
 def test_main():
     # Hit the exception early
-    open_urlresource(TESTDATAURL)
+    try:
+        open_urlresource(TESTDATAURL)
+    except IOError:
+        raise TestSkipped("could not retrieve " + TESTDATAURL)
     run_unittest(NormalizationTest)
 
 if __name__ == "__main__":