sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

pytest: security_descriptors comparison is quieter

Browse Source 
This matters when we have a millions failures.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2023-08-09 14:15:27 +12:00 committed by Andrew Bartlett
parent 829d77b4a0
commit 5569c17741
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/samba/tests/security_descriptors.py
View File

@ -73,7 +73,6 @@ class SDDLvsDescriptorBase(TestCase):
name = f"{name[:100]}+{len(name) - 100}-more-characters-{tag}"
cls.generate_dynamic_test('test_sddl_vs_sd', name, sddl, sdl)
def _test_sddl_vs_sd_with_args(self, sddl, sdl):
sdb_win = bytes(sdl)
try:
@ -90,11 +89,7 @@ class SDDLvsDescriptorBase(TestCase):
try:
sd_win = ndr_unpack(security.descriptor, sdb_win)
except RuntimeError as e:
self.fail(f"could not unpack windows descriptor for {sddl}: {e}\n"
f"windows {len(sdb_win)} bytes: {sdb_win.hex(' ')}\n"
f"samba {len(sdb_sam)} bytes: {sdb_sam.hex(' ')}\n"
f"colour diff {colourdiff(sdb_win, sdb_sam)}\n"
f"SAMBA SD is\n{ndr_print(sd_sam)}")
self.fail(f"could not unpack windows descriptor for {sddl}: {e}")
if self.munge_to_v4:
# Force the ACL revisions to match Samba. Windows seems to
@ -125,10 +120,7 @@ class SDDLvsDescriptorBase(TestCase):
sd_win.sacl.revision = 4
if (sd_win != sd_sam):
self.fail(f"Descriptors differ for {sddl}\n"
f"windows {len(sdb_win)} bytes: {sdb_win.hex(' ')}\n"
f"samba {len(sdb_sam)} bytes: {sdb_sam.hex(' ')}\n"
f"colour diff {colourdiff(sdb_win, sdb_sam)}")
self.fail(f"Descriptors differ for {sddl}")
@DynamicTestCase