diff options
| author | Noel Power <noel.power@suse.com> | 2018-06-15 15:55:59 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-09-15 15:18:30 +0200 |
| commit | 9a5a2e069e6c98e2b8aeb6ce6048377fc4830c54 (patch) | |
| tree | 8f1a8757c5a751b35559911e2e3268f4548d1241 /source4 | |
| parent | 71900d92bb167399367a1d49e6d357f6026587e5 (diff) | |
| download | samba-9a5a2e069e6c98e2b8aeb6ce6048377fc4830c54.tar.gz | |
s4/selftest: enable samba4.drs.link_conflicts for py3
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/selftest/tests.py | 3 | ||||
| -rw-r--r-- | source4/torture/drs/python/link_conflicts.py | 2 |
2 files changed, 2 insertions, 3 deletions
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 |