From: Douglas Bagnall Date: Wed, 13 Jun 2018 04:28:55 +0000 (+1200) Subject: s4/torture/drs/python: don't double-call enable/disable replication X-Git-Tag: tevent-0.9.37~203 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da30b37e68baee90102a95a3e62ef537b36c06af;p=thirdparty%2Fsamba.git s4/torture/drs/python: don't double-call enable/disable replication This is repeating work done in setup/teardown or doubling up in place (self._enable_all_repl includes self._enable_inbound_repl) Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/source4/torture/drs/python/repl_schema.py b/source4/torture/drs/python/repl_schema.py index 61c08be6db9..89346af724d 100644 --- a/source4/torture/drs/python/repl_schema.py +++ b/source4/torture/drs/python/repl_schema.py @@ -308,9 +308,6 @@ class DrsReplSchemaTestCase(drs_base.DrsBaseTestCase): This ensures that the server """ - # disable automatic replication temporary - self._disable_all_repl(self.dnsname_dc1) - self._disable_all_repl(self.dnsname_dc2) # add new attributeSchema object (a_ldn, a_dn) = self._schema_new_attr(self.ldb_dc1, "attr-OU-S", 14) diff --git a/source4/torture/drs/python/replica_sync_rodc.py b/source4/torture/drs/python/replica_sync_rodc.py index 907cef49792..d93c4549647 100644 --- a/source4/torture/drs/python/replica_sync_rodc.py +++ b/source4/torture/drs/python/replica_sync_rodc.py @@ -43,14 +43,12 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase): def setUp(self): super(DrsReplicaSyncTestCase, self).setUp() - self._disable_inbound_repl(self.dnsname_dc1) self._disable_all_repl(self.dnsname_dc1) self.ou1 = None self.ou2 = None def tearDown(self): # re-enable replication - self._enable_inbound_repl(self.dnsname_dc1) self._enable_all_repl(self.dnsname_dc1) super(DrsReplicaSyncTestCase, self).tearDown()