[Python-checkins] r76010 - in python/branches/py3k/Lib/test: test_bytes.py test_multibytecodec_support.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun Nov  1 16:59:11 2009
New Revision: 76010

Log:
Fix test skipping in multibyte codec tests



Modified:
   python/branches/py3k/Lib/test/test_bytes.py
   python/branches/py3k/Lib/test/test_multibytecodec_support.py

Modified: python/branches/py3k/Lib/test/test_bytes.py
==============================================================================
--- python/branches/py3k/Lib/test/test_bytes.py	(original)
+++ python/branches/py3k/Lib/test/test_bytes.py	Sun Nov  1 16:59:11 2009
@@ -935,7 +935,7 @@
             self.assertRaises(BytesWarning, operator.eq, bytearray(b''), '')
             self.assertRaises(BytesWarning, operator.ne, bytearray(b''), '')
         else:
-            # raise test.support.TestSkipped("BytesWarning is needed for this test: use -bb option")
+            # self.skipTest("BytesWarning is needed for this test: use -bb option")
             pass
 
     # Optimizations:

Modified: python/branches/py3k/Lib/test/test_multibytecodec_support.py
==============================================================================
--- python/branches/py3k/Lib/test/test_multibytecodec_support.py	(original)
+++ python/branches/py3k/Lib/test/test_multibytecodec_support.py	Sun Nov  1 16:59:11 2009
@@ -279,7 +279,7 @@
         try:
             self.open_mapping_file() # test it to report the error early
         except IOError:
-            raise support.TestSkipped("Could not retrieve "+self.mapfileurl)
+            self.skipTest("Could not retrieve "+self.mapfileurl)
 
     def open_mapping_file(self):
         return support.open_urlresource(self.mapfileurl)