[Python-checkins] r76035 - in python/branches/release26-maint: Lib/test/test_normalization.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Nov  1 22:34:42 2009
New Revision: 76035

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_normalization.py

Modified: python/branches/release26-maint/Lib/test/test_normalization.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_normalization.py	(original)
+++ python/branches/release26-maint/Lib/test/test_normalization.py	Sun Nov  1 22:34:42 2009
@@ -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 @@
 
 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__":