diff options
| author | Kamen Mazdrashki <kamenim@samba.org> | 2014-11-27 05:20:22 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-02-03 05:02:12 +0100 |
| commit | b4ccfbc214a52b2d8d3747614e445bccfac9a63b (patch) | |
| tree | 764cc0cb27e22215580e96c3be55d7f581731db7 /source4/dsdb | |
| parent | ac2931628cb79543b8ed96b4522bff8958541bd5 (diff) | |
| download | samba-b4ccfbc214a52b2d8d3747614e445bccfac9a63b.tar.gz samba-b4ccfbc214a52b2d8d3747614e445bccfac9a63b.tar.xz samba-b4ccfbc214a52b2d8d3747614e445bccfac9a63b.zip | |
s4-dsdb/test: Delete any leftover objects in the beginning of Cross-NC test
This way we ensure that samdb is clean before we make the test
Change-Id: I3c6fc94763807394e52b6df41548e9aba8b452c1
Signed-off-by: Kamen Mazdrashki <kamenim@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/tests/python/tombstone_reanimation.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/dsdb/tests/python/tombstone_reanimation.py b/source4/dsdb/tests/python/tombstone_reanimation.py index faa78bbdd1..c2ec2b865a 100644 --- a/source4/dsdb/tests/python/tombstone_reanimation.py +++ b/source4/dsdb/tests/python/tombstone_reanimation.py @@ -264,6 +264,10 @@ class BaseRestoreObjectTestCase(RestoredObjectAttributesBaseTestCase): c2 = "cn=ldaptestcontainer2," + self.configuration_dn c3 = "cn=ldaptestcontainer," + self.configuration_dn c4 = "cn=ldaptestcontainer2," + self.base_dn + samba.tests.delete_force(self.samdb, c1) + samba.tests.delete_force(self.samdb, c2) + samba.tests.delete_force(self.samdb, c3) + samba.tests.delete_force(self.samdb, c4) self.samdb.add({ "dn": c1, "objectclass": "container"}) @@ -293,8 +297,6 @@ class BaseRestoreObjectTestCase(RestoredObjectAttributesBaseTestCase): #assert undeletion will work in same nc self.undelete_deleted(str(objDeleted1.dn), c4, self.samdb) self.undelete_deleted(str(objDeleted2.dn), c3, self.samdb) - samba.tests.delete_force(self.samdb, c3) - samba.tests.delete_force(self.samdb, c4) class RestoreUserObjectTestCase(RestoredObjectAttributesBaseTestCase): |