summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2011-02-22 04:16:55 +0200
committerKamen Mazdrashki <kamenim@samba.org>2011-02-27 00:23:20 +0200
commit62a6b754828e8e825b9ee732defc6b3855e06489 (patch)
treead00b7a16187494cc6c89faaaefdcfd3abf87f17 /source4
parent281e3060451720445c4fb12f5dbbe5ccdc84ca92 (diff)
downloadsamba-62a6b754828e8e825b9ee732defc6b3855e06489.tar.gz
samba-62a6b754828e8e825b9ee732defc6b3855e06489.tar.bz2
samba-62a6b754828e8e825b9ee732defc6b3855e06489.zip
s4/drs-test: remove netReplicateCmd test from 'deleted object' test case
DCs synchronization is moved to the test case setUp method as there is no guarantee for the order of execution of tests in a test case - thus netReplicateCmd may be executed after ReplicateDeleteOjbect test
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/drs/python/delete_object.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/source4/torture/drs/python/delete_object.py b/source4/torture/drs/python/delete_object.py
index 64f8cfe5dd..df8d04cb83 100644
--- a/source4/torture/drs/python/delete_object.py
+++ b/source4/torture/drs/python/delete_object.py
@@ -44,6 +44,9 @@ class DrsDeleteObjectTestCase(drs_base.DrsBaseTestCase):
def setUp(self):
super(DrsDeleteObjectTestCase, self).setUp()
+ # make sure DCs are synchronized before the test
+ self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True)
+ self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True)
# disable automatic replication temporary
self._disable_inbound_repl(self.dnsname_dc1)
self._disable_inbound_repl(self.dnsname_dc2)
@@ -83,15 +86,6 @@ class DrsDeleteObjectTestCase(drs_base.DrsBaseTestCase):
self.assertEquals(user_orig["dn"], user_cur["dn"])
self.assertTrue(dodn not in str(user_cur["dn"]))
- def test_NetReplicateCmd(self):
- """Triggers replication from DC1 to DC2
- and vice versa so both DCs are synchronized
- before test_ReplicateDeteleteObject test"""
- # replicate Domain NC on DC2 from DC1
- self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1)
- # replicate Domain NC on DC1 from DC2
- self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2)
-
def test_ReplicateDeteleteObject(self):
"""Verifies how a deleted-object is replicated between two DCs.
This test should verify that:
@@ -128,7 +122,7 @@ class DrsDeleteObjectTestCase(drs_base.DrsBaseTestCase):
# trigger replication from DC2 to DC1
# to check if deleted object gets restored
- self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, fored=True)
+ self._net_drs_replicate(DC=self.dnsname_dc1, fromDC=self.dnsname_dc2, forced=True)
# check user info on DC1 - should be deleted
self._check_user(sam_ldb=self.ldb_dc1, user_orig=user_orig, is_deleted=True)
# check user info on DC2 - should be valid user