diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index d7e45a934de..bcf9e0ac7c1 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -1034,7 +1034,8 @@ for env in ['vampire_dc', 'promoted_dc']: extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')], name="samba4.drs.link_conflicts.python(%s)" % env, 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']: planoldpythontestsuite(env, "repl_schema", diff --git a/source4/torture/drs/python/link_conflicts.py b/source4/torture/drs/python/link_conflicts.py index 3b48a880e0c..3066412c230 100644 --- a/source4/torture/drs/python/link_conflicts.py +++ b/source4/torture/drs/python/link_conflicts.py @@ -303,7 +303,6 @@ class DrsReplicaLinkConflictTestCase(drs_base.DrsBaseTestCase): for val in [str(val) for val in res1[0]["member"]]: # check the expected conflicting object was renamed - #val = str(val) self.assertFalse("CNF:%s" % target2_guid in val) if "CNF:%s" % target1_guid in val: target1_conflict = True @@ -390,7 +389,6 @@ class DrsReplicaLinkConflictTestCase(drs_base.DrsBaseTestCase): for val in [str(val) for val in res1[0]["memberOf"]]: # check the conflicting object was renamed - #val = str(val) self.assertFalse("CNF:%s" % src2_guid in val) if "CNF:%s" % src1_guid in val: src1_backlink = True