mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 19:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Clean up warnings filter use in test_bytes.

Browse source
This commit is contained in:
Brett Cannon 2010-03-20 21:45:01 +00:00
parent 776289934c
commit 41a08bcb83
1 changed files with 41 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

83
Lib/test/test_bytes.py
View file

@ -27,12 +27,6 @@ class Indexable:
class BaseBytesTest(unittest.TestCase): class BaseBytesTest(unittest.TestCase):
def setUp(self):
self.warning_filters = warnings.filters[:]
def tearDown(self):
warnings.filters = self.warning_filters
def test_basics(self): def test_basics(self):
b = self.type2test() b = self.type2test()
self.assertEqual(type(b), self.type2test) self.assertEqual(type(b), self.type2test)
@ -127,15 +121,19 @@ class BaseBytesTest(unittest.TestCase):
self.assertFalse(b3 <= b2) self.assertFalse(b3 <= b2)
def test_compare_to_str(self): def test_compare_to_str(self):
warnings.simplefilter('ignore', BytesWarning) with test.support.check_warnings():
# Byte comparisons with unicode should always fail! warnings.simplefilter('ignore', BytesWarning)
# Test this for all expected byte orders and Unicode character sizes # Byte comparisons with unicode should always fail!
self.assertEqual(self.type2test(b"\0a\0b\0c") == "abc", False) # Test this for all expected byte orders and Unicode character
self.assertEqual(self.type2test(b"\0\0\0a\0\0\0b\0\0\0c") == "abc", False) # sizes.
self.assertEqual(self.type2test(b"a\0b\0c\0") == "abc", False) self.assertEqual(self.type2test(b"\0a\0b\0c") == "abc", False)
self.assertEqual(self.type2test(b"a\0\0\0b\0\0\0c\0\0\0") == "abc", False) self.assertEqual(self.type2test(b"\0\0\0a\0\0\0b\0\0\0c") == "abc",
self.assertEqual(self.type2test() == str(), False) False)
self.assertEqual(self.type2test() != str(), True) self.assertEqual(self.type2test(b"a\0b\0c\0") == "abc", False)
self.assertEqual(self.type2test(b"a\0\0\0b\0\0\0c\0\0\0") == "abc",
False)
self.assertEqual(self.type2test() == str(), False)
self.assertEqual(self.type2test() != str(), True)
def test_reversed(self): def test_reversed(self):
input = list(map(ord, "Hello")) input = list(map(ord, "Hello"))
@ -829,22 +827,17 @@ class AssortedBytesTest(unittest.TestCase):
# Test various combinations of bytes and bytearray # Test various combinations of bytes and bytearray
# #
def setUp(self):
self.warning_filters = warnings.filters[:]
def tearDown(self):
warnings.filters = self.warning_filters
def test_repr_str(self): def test_repr_str(self):
warnings.simplefilter('ignore', BytesWarning) with test.support.check_warnings():
for f in str, repr: warnings.simplefilter('ignore', BytesWarning)
self.assertEqual(f(bytearray()), "bytearray(b'')") for f in str, repr:
self.assertEqual(f(bytearray([0])), "bytearray(b'\\x00')") self.assertEqual(f(bytearray()), "bytearray(b'')")
self.assertEqual(f(bytearray([0, 1, 254, 255])), self.assertEqual(f(bytearray([0])), "bytearray(b'\\x00')")
"bytearray(b'\\x00\\x01\\xfe\\xff')") self.assertEqual(f(bytearray([0, 1, 254, 255])),
self.assertEqual(f(b"abc"), "b'abc'") "bytearray(b'\\x00\\x01\\xfe\\xff')")
self.assertEqual(f(b"'"), '''b"'"''') # ''' self.assertEqual(f(b"abc"), "b'abc'")
self.assertEqual(f(b"'\""), r"""b'\'"'""") # ' self.assertEqual(f(b"'"), '''b"'"''') # '''
self.assertEqual(f(b"'\""), r"""b'\'"'""") # '
def test_compare_bytes_to_bytearray(self): def test_compare_bytes_to_bytearray(self):
self.assertEqual(b"abc" == bytes(b"abc"), True) self.assertEqual(b"abc" == bytes(b"abc"), True)
@ -888,13 +881,14 @@ class AssortedBytesTest(unittest.TestCase):
self.assertEqual(b, bytearray(sample)) self.assertEqual(b, bytearray(sample))
def test_to_str(self): def test_to_str(self):
warnings.simplefilter('ignore', BytesWarning) with test.support.check_warnings():
self.assertEqual(str(b''), "b''") warnings.simplefilter('ignore', BytesWarning)
self.assertEqual(str(b'x'), "b'x'") self.assertEqual(str(b''), "b''")
self.assertEqual(str(b'\x80'), "b'\\x80'") self.assertEqual(str(b'x'), "b'x'")
self.assertEqual(str(bytearray(b'')), "bytearray(b'')") self.assertEqual(str(b'\x80'), "b'\\x80'")
self.assertEqual(str(bytearray(b'x')), "bytearray(b'x')") self.assertEqual(str(bytearray(b'')), "bytearray(b'')")
self.assertEqual(str(bytearray(b'\x80')), "bytearray(b'\\x80')") self.assertEqual(str(bytearray(b'x')), "bytearray(b'x')")
self.assertEqual(str(bytearray(b'\x80')), "bytearray(b'\\x80')")
def test_literal(self): def test_literal(self):
tests = [ tests = [
@ -940,11 +934,16 @@ class AssortedBytesTest(unittest.TestCase):
def test_compare(self): def test_compare(self):
if sys.flags.bytes_warning: if sys.flags.bytes_warning:
warnings.simplefilter('error', BytesWarning) with test.support.check_warnings():
self.assertRaises(BytesWarning, operator.eq, b'', '') warnings.simplefilter('error', BytesWarning)
self.assertRaises(BytesWarning, operator.ne, b'', '') with self.assertRaises(BytesWarning):
self.assertRaises(BytesWarning, operator.eq, bytearray(b''), '') b'' == ''
self.assertRaises(BytesWarning, operator.ne, bytearray(b''), '') with self.assertRaises(BytesWarning):
b'' != ''
with self.assertRaises(BytesWarning):
bytearray(b'') == ''
with self.assertRaises(BytesWarning):
bytearray(b'') != ''
else: else:
# self.skipTest("BytesWarning is needed for this test: use -bb option") # self.skipTest("BytesWarning is needed for this test: use -bb option")
pass pass