diff options
| author | Tim Beale <timbeale@catalyst.net.nz> | 2017-09-28 09:42:14 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-10-20 04:05:21 +0200 |
| commit | 82b56e63b5cb7e19a580a7cdeaf1caa8608852bc (patch) | |
| tree | 49dae49fbe814adbe9db3deda900c00b5fa9e961 /source4/torture/drs | |
| parent | f36b2bb126ccdc9a68b3b51b999f59090c7d8b82 (diff) | |
| download | samba-82b56e63b5cb7e19a580a7cdeaf1caa8608852bc.tar.gz | |
replmd: Handle single-valued conflicts for an existing link
Currently the code only handles the case where the received link
attribute is a new link (i.e. pdn == NULL). As well as this, we need to
handle the case where the conflicting link already exists, i.e. it's a
deleted link that has been re-added on another DC.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13055
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/torture/drs')
| -rw-r--r-- | source4/torture/drs/python/link_conflicts.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/torture/drs/python/link_conflicts.py b/source4/torture/drs/python/link_conflicts.py index 036472bb9ea..c8b65563ad6 100644 --- a/source4/torture/drs/python/link_conflicts.py +++ b/source4/torture/drs/python/link_conflicts.py @@ -668,11 +668,8 @@ class DrsReplicaLinkConflictTestCase(drs_base.DrsBaseTestCase): self.ensure_unique_timestamp() self.add_link_attr(self.ldb_dc2, src_ou, "managedBy", target2_ou) - # try to sync the 2 DCs (this currently fails) - try: - self.sync_DCs(sync_order=sync_order) - except Exception, e: - self.fail("Replication could not resolve link conflict: %s" % e) + # try to sync the 2 DCs + self.sync_DCs(sync_order=sync_order) res1 = self.ldb_dc1.search(base="<GUID=%s>" % src_guid, scope=SCOPE_BASE, attrs=["managedBy"]) |