From: Noel Power Date: Tue, 14 Aug 2018 10:43:44 +0000 (+0100) Subject: python/samba/tests: Adjust teardown so second run of tests succeeds X-Git-Tag: tdb-1.3.17~1905 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6fd15e2337e821cdb102d08cd889aa11336e145;p=thirdparty%2Fsamba.git python/samba/tests: Adjust teardown so second run of tests succeeds A second run of this test (e.g. with --extra-python) or even an manual re-run and the cache is still there. use of '--cache-ldb-initialize' will fail and so with the test Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py index 5449db33a52..be090030afd 100644 --- a/python/samba/tests/samba_tool/user.py +++ b/python/samba/tests/samba_tool/user.py @@ -29,6 +29,7 @@ from samba.ndr import ndr_unpack from samba.dcerpc import drsblobs from samba.compat import get_bytes from samba.compat import get_string +from samba.tests import env_loadparm class UserCmdTestCase(SambaToolCmdTest): @@ -66,6 +67,13 @@ class UserCmdTestCase(SambaToolCmdTest): for user in self.users: if self._find_user(user["name"]): self.runsubcmd("user", "delete", user["name"]) + lp = env_loadparm() + # second run of this test (e.g. with --extra-python) + # the cache is still there and '--cache-ldb-initialize' + # will fail + cachedb = lp.private_path("user-syncpasswords-cache.ldb") + if os.path.exists(cachedb): + os.remove(cachedb) def test_newuser(self): # try to add all the users again, this should fail