From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 1 Nov 2009 21:43:20 +0000 (+0000)
Subject: Merged revisions 76033 via svnmerge from
X-Git-Tag: v3.2a1~2252
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e05e7d3b64b3874b8086e607601edd0f46666bd;p=thirdparty%2FPython%2Fcpython.git

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 94d65b89dd50..664155473464 100644
--- 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__":