From 29ff3ce56894d5ef0254c85d6ae9e68733558901 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 8 Jun 2012 13:37:49 +1000 Subject: s4-selftest: Test samba-tool drs replicate --local --full-sync --- source4/torture/drs/python/drs_base.py | 6 +++++- source4/torture/drs/python/replica_sync.py | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'source4/torture') diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py index 8e48b92f7a..abfdbf5bd3 100644 --- a/source4/torture/drs/python/drs_base.py +++ b/source4/torture/drs/python/drs_base.py @@ -98,13 +98,17 @@ class DrsBaseTestCase(samba.tests.BlackboxTestCase): # bin/samba-tool drs return "%s drs %s %s" % (samba_tool_cmd, drs_command, cmdline_auth) - def _net_drs_replicate(self, DC, fromDC, nc_dn=None, forced=True): + def _net_drs_replicate(self, DC, fromDC, nc_dn=None, forced=True, local=False, full_sync=False): if nc_dn is None: nc_dn = self.domain_dn # make base command line samba_tool_cmdline = self._samba_tool_cmdline("replicate") if forced: samba_tool_cmdline += " --sync-forced" + if local: + samba_tool_cmdline += " --local" + if full_sync: + samba_tool_cmdline += " --full-sync" # bin/samba-tool drs replicate cmd_line = "%s %s %s %s" % (samba_tool_cmdline, DC, fromDC, nc_dn) return self.check_output(cmd_line) diff --git a/source4/torture/drs/python/replica_sync.py b/source4/torture/drs/python/replica_sync.py index ddeb5822f5..af2da4fceb 100644 --- a/source4/torture/drs/python/replica_sync.py +++ b/source4/torture/drs/python/replica_sync.py @@ -63,3 +63,9 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase): """Tests we cann't replicate when replication is disabled""" self._disable_inbound_repl(self.dnsname_dc1) out = self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True) + + def test_ReplLocal(self): + """Tests we can replicate direct to the local db""" + self._enable_inbound_repl(self.dnsname_dc1) + self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=False, local=True, full_sync=True) + -- cgit