[Python-checkins] r76011 - in python/branches/release31-maint: Lib/test/test_bytes.py Lib/test/test_multibytecodec_support.py

Sun Nov 1 17:04:09 CET 2009

Author: antoine.pitrou
Date: Sun Nov 1 17:04:09 2009
New Revision: 76011
Log:
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
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/test/test_bytes.py
 python/branches/release31-maint/Lib/test/test_multibytecodec_support.py
Modified: python/branches/release31-maint/Lib/test/test_bytes.py
==============================================================================

--- python/branches/release31-maint/Lib/test/test_bytes.py	(original)
+++ python/branches/release31-maint/Lib/test/test_bytes.py	Sun Nov 1 17:04:09 2009
@@ -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:
Modified: python/branches/release31-maint/Lib/test/test_multibytecodec_support.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_multibytecodec_support.py	(original)
+++ python/branches/release31-maint/Lib/test/test_multibytecodec_support.py	Sun Nov 1 17:04:09 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)
