IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

range plugin tests: Use bytes with MockLDAP under Python 3

Browse Source 
Part of the work for: https://fedorahosted.org/freeipa/ticket/4985

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Petr Spacek <pspacek@redhat.com>
This commit is contained in:
Petr Viktorin 2016-04-29 16:52:21 +02:00 committed by Martin Basti
parent baaa041b8a
commit 14aba1c7c1
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ipatests/test_xmlrpc/test_range_plugin.py
View File

@ -125,27 +125,35 @@ def get_trust_dn(name):
return format_str.format(**data) return format_str.format(**data)
def encode_mockldap_value(value):
value = str(value)
if six.PY3:
return value.encode('utf-8')
else:
return value
def get_trusted_dom_range_dict(name, base_id, size, rangetype, base_rid, sid): def get_trusted_dom_range_dict(name, base_id, size, rangetype, base_rid, sid):
return dict( return dict(
objectClass=["ipaIDrange", "ipatrustedaddomainrange"], objectClass=[b"ipaIDrange", b"ipatrustedaddomainrange"],
ipaBaseID=str("{base_id}".format(base_id=base_id)), ipaBaseID=encode_mockldap_value("{base_id}".format(base_id=base_id)),
ipaBaseRID=str("{base_rid}".format(base_rid=base_rid)), ipaBaseRID=encode_mockldap_value("{base_rid}".format(base_rid=base_rid)),
ipaIDRangeSize=str("{size}".format(size=size)), ipaIDRangeSize=encode_mockldap_value("{size}".format(size=size)),
ipaNTTrustedDomainSID=str("{sid}".format(sid=sid)), ipaNTTrustedDomainSID=encode_mockldap_value("{sid}".format(sid=sid)),
ipaRangeType=str("{rangetype}".format(rangetype=rangetype)), ipaRangeType=encode_mockldap_value("{rangetype}".format(rangetype=rangetype)),
) )
def get_trusted_dom_dict(name, sid): def get_trusted_dom_dict(name, sid):
return dict( return dict(
objectClass=["ipaNTTrustedDomain", "ipaIDobject", "top"], objectClass=[b"ipaNTTrustedDomain", b"ipaIDobject", b"top"],
ipaNTFlatName=str(name.upper()), ipaNTFlatName=encode_mockldap_value(name.upper()),
ipaNTTrustedDomainSID=str(sid), ipaNTTrustedDomainSID=encode_mockldap_value(sid),
ipaNTSIDBlacklistIncoming='S-1-0', ipaNTSIDBlacklistIncoming=b'S-1-0',
ipaNTTrustPartner=str('{name}.mock'.format(name=name)), ipaNTTrustPartner=encode_mockldap_value('{name}.mock'.format(name=name)),
ipaNTTrustType='2', ipaNTTrustType=b'2',
ipaNTTrustDirection='3', ipaNTTrustDirection=b'3',
ipaNTTrustAttributes='8', ipaNTTrustAttributes=b'8',
) )
# Domain ranges definitions # Domain ranges definitions
@ -359,7 +367,7 @@ domain7range1_dn = get_range_dn(name=domain7range1)
trust_container_dn = "cn=ad,cn=trusts,{basedn}".format(basedn=api.env.basedn) trust_container_dn = "cn=ad,cn=trusts,{basedn}".format(basedn=api.env.basedn)
trust_container_add = dict( trust_container_add = dict(
objectClass=["nsContainer", "top"] objectClass=[b"nsContainer", b"top"]
) )
# Convince Domain Validator that adtrust-install was run in order to test # Convince Domain Validator that adtrust-install was run in order to test
@ -369,7 +377,7 @@ smb_cont_dn = "{cifsdomains},{basedn}".format(
cifsdomains=api.env.container_cifsdomains, cifsdomains=api.env.container_cifsdomains,
basedn=api.env.basedn) basedn=api.env.basedn)
smb_cont_add = dict( smb_cont_add = dict(
objectClass=["nsContainer", "top"] objectClass=[b"nsContainer", b"top"]
) )
trust_local_dn = "cn={domain},{smbcont}".format( trust_local_dn = "cn={domain},{smbcont}".format(
@ -377,10 +385,10 @@ trust_local_dn = "cn={domain},{smbcont}".format(
smbcont=smb_cont_dn) smbcont=smb_cont_dn)
trust_local_add = dict( trust_local_add = dict(
objectClass=["ipaNTDomainAttrs", "nsContainer", "top"], objectClass=[b"ipaNTDomainAttrs", b"nsContainer", b"top"],
ipaNTFlatName=["UNITTESTS"], ipaNTFlatName=[b"UNITTESTS"],
ipaNTDomainGUID=["4ed70def-bff4-464c-889f-6cd2cfa4dbb7"], ipaNTDomainGUID=[b"4ed70def-bff4-464c-889f-6cd2cfa4dbb7"],
ipaNTSecurityIdentifier=["S-1-5-21-2568409255-1212639194-836868319"] ipaNTSecurityIdentifier=[b"S-1-5-21-2568409255-1212639194-836868319"]
) )
user1 = u'tuser1' user1 = u'tuser1'