mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
Issue #26837: assertSequenceEqual() now correctly outputs non-stringified
differing items (like bytes in the -b mode). This affects assertListEqual() and assertTupleEqual().
This commit is contained in:
parent
5b6f0aa71c
commit
685fbed7f9
3 changed files with 83 additions and 3 deletions
|
@ -1121,6 +1121,82 @@ test case
|
|||
error = str(e).split('\n', 1)[1]
|
||||
self.assertEqual(sample_text_error, error)
|
||||
|
||||
def testEqualityBytesWarning(self):
|
||||
if sys.flags.bytes_warning:
|
||||
def bytes_warning():
|
||||
return self.assertWarnsRegex(BytesWarning,
|
||||
'Comparison between bytes and string')
|
||||
else:
|
||||
def bytes_warning():
|
||||
return contextlib.ExitStack()
|
||||
|
||||
with bytes_warning(), self.assertRaises(self.failureException):
|
||||
self.assertEqual('a', b'a')
|
||||
with bytes_warning():
|
||||
self.assertNotEqual('a', b'a')
|
||||
|
||||
a = [0, 'a']
|
||||
b = [0, b'a']
|
||||
with bytes_warning(), self.assertRaises(self.failureException):
|
||||
self.assertListEqual(a, b)
|
||||
with bytes_warning(), self.assertRaises(self.failureException):
|
||||
self.assertTupleEqual(tuple(a), tuple(b))
|
||||
with bytes_warning(), self.assertRaises(self.failureException):
|
||||
self.assertSequenceEqual(a, tuple(b))
|
||||
with bytes_warning(), self.assertRaises(self.failureException):
|
||||
self.assertSequenceEqual(tuple(a), b)
|
||||
with bytes_warning(), self.assertRaises(self.failureException):
|
||||
self.assertSequenceEqual('a', b'a')
|
||||
with bytes_warning(), self.assertRaises(self.failureException):
|
||||
self.assertSetEqual(set(a), set(b))
|
||||
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertListEqual(a, tuple(b))
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertTupleEqual(tuple(a), b)
|
||||
|
||||
a = [0, b'a']
|
||||
b = [0]
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertListEqual(a, b)
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertTupleEqual(tuple(a), tuple(b))
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertSequenceEqual(a, tuple(b))
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertSequenceEqual(tuple(a), b)
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertSetEqual(set(a), set(b))
|
||||
|
||||
a = [0]
|
||||
b = [0, b'a']
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertListEqual(a, b)
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertTupleEqual(tuple(a), tuple(b))
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertSequenceEqual(a, tuple(b))
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertSequenceEqual(tuple(a), b)
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertSetEqual(set(a), set(b))
|
||||
|
||||
with bytes_warning(), self.assertRaises(self.failureException):
|
||||
self.assertDictEqual({'a': 0}, {b'a': 0})
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertDictEqual({}, {b'a': 0})
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertDictEqual({b'a': 0}, {})
|
||||
|
||||
with self.assertRaises(self.failureException):
|
||||
self.assertCountEqual([b'a', b'a'], [b'a', b'a', b'a'])
|
||||
with bytes_warning():
|
||||
self.assertCountEqual(['a', b'a'], ['a', b'a'])
|
||||
with bytes_warning(), self.assertRaises(self.failureException):
|
||||
self.assertCountEqual(['a', 'a'], [b'a', b'a'])
|
||||
with bytes_warning(), self.assertRaises(self.failureException):
|
||||
self.assertCountEqual(['a', 'a', []], [b'a', b'a', []])
|
||||
|
||||
def testAssertIsNone(self):
|
||||
self.assertIsNone(None)
|
||||
self.assertRaises(self.failureException, self.assertIsNone, False)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue