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

s4/selftest: enable samba4.drs.link_conflicts for py3

Browse Source 
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power 2018-06-15 15:55:59 +01:00 committed by Andrew Bartlett
parent 71900d92bb
commit 9a5a2e069e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/selftest/tests.py
View File

@ -1034,7 +1034,8 @@ for env in ['vampire_dc', 'promoted_dc']:
extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')], extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
name="samba4.drs.link_conflicts.python(%s)" % env, name="samba4.drs.link_conflicts.python(%s)" % env,
environ={'DC1': "$DC_SERVER", 'DC2': '$%s_SERVER' % env.upper()}, environ={'DC1': "$DC_SERVER", 'DC2': '$%s_SERVER' % env.upper()},
extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD']) extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'],
py3_compatible=True)
for env in ['vampire_dc', 'promoted_dc', 'vampire_2000_dc']: for env in ['vampire_dc', 'promoted_dc', 'vampire_2000_dc']:
planoldpythontestsuite(env, "repl_schema", planoldpythontestsuite(env, "repl_schema",

2
source4/torture/drs/python/link_conflicts.py
View File

@ -303,7 +303,6 @@ class DrsReplicaLinkConflictTestCase(drs_base.DrsBaseTestCase):
for val in [str(val) for val in res1[0]["member"]]: for val in [str(val) for val in res1[0]["member"]]:
# check the expected conflicting object was renamed # check the expected conflicting object was renamed
#val = str(val)
self.assertFalse("CNF:%s" % target2_guid in val) self.assertFalse("CNF:%s" % target2_guid in val)
if "CNF:%s" % target1_guid in val: if "CNF:%s" % target1_guid in val:
target1_conflict = True target1_conflict = True
@ -390,7 +389,6 @@ class DrsReplicaLinkConflictTestCase(drs_base.DrsBaseTestCase):
for val in [str(val) for val in res1[0]["memberOf"]]: for val in [str(val) for val in res1[0]["memberOf"]]:
# check the conflicting object was renamed # check the conflicting object was renamed
#val = str(val)
self.assertFalse("CNF:%s" % src2_guid in val) self.assertFalse("CNF:%s" % src2_guid in val)
if "CNF:%s" % src1_guid in val: if "CNF:%s" % src1_guid in val:
src1_backlink = True src1_backlink = True