From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 1 Nov 2009 15:59:11 +0000 (+0000)
Subject: Fix test skipping in multibyte codec tests
X-Git-Tag: v3.2a1~2260
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9e92167ac1a1900981f905da7a415cc2cb404d0;p=thirdparty%2FPython%2Fcpython.git

Fix test skipping in multibyte codec tests
---

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index e39b9ead8331..4a93e8caf0db 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -935,7 +935,7 @@ class AssortedBytesTest(unittest.TestCase):
             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:
diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py
index 5e68856b7a06..e4036bf2c6a6 100644
--- a/Lib/test/test_multibytecodec_support.py
+++ b/Lib/test/test_multibytecodec_support.py
@@ -279,7 +279,7 @@ class TestBase_Mapping(unittest.TestCase):
         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)