The branch, master has been updated via a3856ee4dc8 python:tests: pass bytes.decode() instead of str(bytes) to assertMultiLineEqual() to get better failure output from 6f3545cecad python:tests: Use assertMultiLineEqual() to get better failure output
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a3856ee4dc8ae1e4ab2f56df50a8a90f7ef33b0a Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jul 15 20:14:46 2024 +0200 python:tests: pass bytes.decode() instead of str(bytes) to assertMultiLineEqual() to get better failure output When not equal a diff of the two strings highlighting the differences will be included this way. This is a flapping test. Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Tue Jul 16 07:40:41 UTC 2024 on atb-devel-224 ----------------------------------------------------------------------- Summary of changes: python/samba/tests/dckeytab.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/python/samba/tests/dckeytab.py b/python/samba/tests/dckeytab.py index edb8a079da0..9dee64e0cea 100644 --- a/python/samba/tests/dckeytab.py +++ b/python/samba/tests/dckeytab.py @@ -174,7 +174,8 @@ class DCKeytabTests(TestCaseInTempDir): ).communicate()[0] self.maxDiff = None # No maximum length of diffs. - self.assertMultiLineEqual(str(keytab_orig_content), str(keytab_content)) + self.assertMultiLineEqual(keytab_orig_content.decode(), + keytab_content.decode()) # Parse the first entry in the keytab with open(self.ktfile, 'rb') as bytes_kt: -- Samba Shared Repository