sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

s4/pytest: remove py2 str/bytes workaround in getnc_exop

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2024-06-12 11:11:27 +12:00 committed by Andrew Bartlett
parent 788ef8f07c
commit de19f4d675
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/torture/drs/python/getnc_exop.py
View File

@ -1093,7 +1093,7 @@ class DrsReplicaPrefixMapTestCase(drs_base.DrsBaseTestCase):
schi = drsuapi.DsReplicaOIDMapping() schi = drsuapi.DsReplicaOIDMapping()
schi.id_prefix = 0 schi.id_prefix = 0
if 'schemaInfo' in res[0]: if 'schemaInfo' in res[0]:
binary_oid = [x if isinstance(x, int) else ord(x) for x in res[0]['schemaInfo'][0]] binary_oid = list(res[0]['schemaInfo'][0])
schi.oid.length = len(binary_oid) schi.oid.length = len(binary_oid)
schi.oid.binary_oid = binary_oid schi.oid.binary_oid = binary_oid
else: else:
@ -1102,7 +1102,7 @@ class DrsReplicaPrefixMapTestCase(drs_base.DrsBaseTestCase):
schema_info.marker = 0xFF schema_info.marker = 0xFF
schema_info.invocation_id = misc.GUID(samdb.get_invocation_id()) schema_info.invocation_id = misc.GUID(samdb.get_invocation_id())
binary_oid = [x if isinstance(x, int) else ord(x) for x in ndr_pack(schema_info)] binary_oid = list(ndr_pack(schema_info))
# you have to set the length before setting binary_oid # you have to set the length before setting binary_oid
schi.oid.length = len(binary_oid) schi.oid.length = len(binary_oid)
schi.oid.binary_oid = binary_oid schi.oid.binary_oid = binary_oid