diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-11-01 06:53:56 +1300 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-12-03 12:50:18 +0100 |
| commit | d38677abd9285d571ecacce9f53dfc543836524c (patch) | |
| tree | 6da8921b3e82e7e69fb7b5fe2c03571a72217f1f | |
| parent | 329b78ed92cc8d08ca2ca88653890a8a60aa1a7b (diff) | |
| download | samba-d38677abd9285d571ecacce9f53dfc543836524c.tar.gz | |
s4-torture: Reduce flapping in SambaToolDrsTests.test_samba_tool_replicate_local
This test often flaps in Samba 4.9 (where more tests and DCs run in the environment)
with obj_1 being 3. This is quite OK, we just need to see some changes get
replicated, not 0 changes.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
(cherry picked from commit 4ae0f9ce0f5ada99cf1d236377e5a1234c879ae3)
| -rw-r--r-- | source4/torture/drs/python/samba_tool_drs.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/torture/drs/python/samba_tool_drs.py b/source4/torture/drs/python/samba_tool_drs.py index 76cc86f832e..988f1dc7a3c 100644 --- a/source4/torture/drs/python/samba_tool_drs.py +++ b/source4/torture/drs/python/samba_tool_drs.py @@ -210,6 +210,7 @@ class SambaToolDrsTests(drs_base.DrsBaseTestCase): self._disable_inbound_repl(self.dnsname_dc1) self._disable_inbound_repl(self.dnsname_dc2) + self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1) self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2) # add an object with link on dc1 @@ -232,7 +233,7 @@ class SambaToolDrsTests(drs_base.DrsBaseTestCase): (obj_1, link_1) = get_num_obj_links(out) - self.assertEqual(obj_1, 2) + self.assertGreaterEqual(obj_1, 2) self.assertEqual(link_1, 1) # pull that change with --local into local db from dc2: shouldn't send link or object |