sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

s4-torture: Reduce flapping in SambaToolDrsTests.test_samba_tool_replicate_local

Browse Source 
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)
This commit is contained in:
Andrew Bartlett 2019-11-01 06:53:56 +13:00 committed by Karolin Seeger
parent 90073f0abc
commit 38db53fa5e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/torture/drs/python/samba_tool_drs.py
View File

@ -209,6 +209,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
@ -231,7 +232,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