s4:dsdb/tests: let the user_account_control.py test recover from a previous failure

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py
index c583883ae28e1004cafc28369dce33a088eaaa49..1f3a2823c93fe7e35d85c6d3afc01dc20cc8bd2e 100755 (executable)
--- a/source4/dsdb/tests/python/user_account_control.py
+++ b/source4/dsdb/tests/python/user_account_control.py
@@ -123,11 +123,17 @@ class UserAccountControlTests(samba.tests.TestCase):
         self.admin_samdb = SamDB(url=ldaphost,
                                  session_info=system_session(),
                                  credentials=self.admin_creds, lp=lp)
+        self.domain_sid = security.dom_sid(self.admin_samdb.get_domain_sid())
+        self.base_dn = self.admin_samdb.domain_dn()
 
         self.unpriv_user = "testuser1"
         self.unpriv_user_pw = "samba123@"
         self.unpriv_creds = self.get_creds(self.unpriv_user, self.unpriv_user_pw)
 
+        delete_force(self.admin_samdb, "CN=testcomputer-t,OU=test_computer_ou1,%s" % (self.base_dn))
+        delete_force(self.admin_samdb, "OU=test_computer_ou1,%s" % (self.base_dn))
+        delete_force(self.admin_samdb, "CN=%s,CN=Users,%s" % (self.unpriv_user, self.base_dn))
+
         self.admin_samdb.newuser(self.unpriv_user, self.unpriv_user_pw)
         res = self.admin_samdb.search("CN=%s,CN=Users,%s" % (self.unpriv_user, self.admin_samdb.domain_dn()),
                                       scope=SCOPE_BASE,
@@ -138,8 +144,6 @@ class UserAccountControlTests(samba.tests.TestCase):
         self.unpriv_user_dn = res[0].dn
 
         self.samdb = SamDB(url=ldaphost, credentials=self.unpriv_creds, lp=lp)
-        self.domain_sid = security.dom_sid(self.samdb.get_domain_sid())
-        self.base_dn = self.samdb.domain_dn()
 
         self.samr = samr.samr("ncacn_ip_tcp:%s[seal]" % host, lp, self.unpriv_creds)
         self.samr_handle = self.samr.Connect2(None, security.SEC_FLAG_MAXIMUM_ALLOWED)