[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Mon Jul 15 13:52:02 UTC 2024


The branch, master has been updated
       via  6f3545cecad python:tests: Use assertMultiLineEqual() to get better failure output
      from  bbe2c82f620 smbd: Show blk and chr devices as nfs reparse points

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6f3545cecad810793d8eabb5a7c9fa41af964fc0
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jul 15 10:25:50 2024 +0200

    python:tests: Use 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.
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Jul 15 13:51:03 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 6c8a1795e0f..edb8a079da0 100644
--- a/python/samba/tests/dckeytab.py
+++ b/python/samba/tests/dckeytab.py
@@ -173,7 +173,8 @@ class DCKeytabTests(TestCaseInTempDir):
             stderr=subprocess.STDOUT,
         ).communicate()[0]
 
-        self.assertEqual(keytab_orig_content, keytab_content)
+        self.maxDiff = None  # No maximum length of diffs.
+        self.assertMultiLineEqual(str(keytab_orig_content), str(keytab_content))
 
         # Parse the first entry in the keytab
         with open(self.ktfile, 'rb') as bytes_kt:


-- 
Samba Shared Repository



More information about the samba-cvs mailing list