diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-01 16:04:09 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-01 16:04:09 (GMT) |
| commit | 344ec44be1290434254b58e8e8aae157d8bc1159 (patch) | |
| tree | 1a465bae66ed4da366f31998ef00a5d52b4918cc | |
| parent | 412f41e8ece0ef933162757abb5d32f0809d4285 (diff) | |
| download | cpython-344ec44be1290434254b58e8e8aae157d8bc1159.zip cpython-344ec44be1290434254b58e8e8aae157d8bc1159.tar.gz cpython-344ec44be1290434254b58e8e8aae157d8bc1159.tar.bz2 | |
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
........
| -rw-r--r-- | Lib/test/test_bytes.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_multibytecodec_support.py | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ 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 5e68856..e4036bf 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) |