Merged revisions 76010 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r76010 | antoine.pitrou | 2009-11-01 16:59:11 +0100 (dim., 01 nov. 2009) | 3 lines
Fix test skipping in multibyte codec tests
........
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 39c91b4..f2222a1 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -933,7 +933,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:
diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py
index 5e68856..e4036bf 100644
--- a/Lib/test/test_multibytecodec_support.py
+++ b/Lib/test/test_multibytecodec_support.py
@@ -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)