sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-07 21:44:22 +03:00
Code Activity

python/samba/tests: Adjust teardown so second run of tests succeeds

Browse Source 
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 <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power
2018-08-14 11:43:44 +01:00
committed by Andrew Bartlett
parent 9df799d1b2
commit c6fd15e233
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/samba/tests/samba_tool/user.py
View File

@@ -29,6 +29,7 @@ from samba.ndr import ndr_unpack
from samba.dcerpc import drsblobs from samba.dcerpc import drsblobs
from samba.compat import get_bytes from samba.compat import get_bytes
from samba.compat import get_string from samba.compat import get_string
from samba.tests import env_loadparm
class UserCmdTestCase(SambaToolCmdTest): class UserCmdTestCase(SambaToolCmdTest):
@@ -66,6 +67,13 @@ class UserCmdTestCase(SambaToolCmdTest):
for user in self.users: for user in self.users:
if self._find_user(user["name"]): if self._find_user(user["name"]):
self.runsubcmd("user", "delete", 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): def test_newuser(self):
# try to add all the users again, this should fail # try to add all the users again, this should fail