summaryrefslogtreecommitdiffstats
path: root/source4/scripting/python/samba/tests
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-09-30 12:45:00 -0700
committerAndrew Tridgell <tridge@samba.org>2010-09-30 14:36:12 -0700
commit176ecce9a661c9145620c3f7af9d13025ed0616c (patch)
treec1dbce6f1114964dd2394ec5c755a9a75d6394de /source4/scripting/python/samba/tests
parent67a04613e9106f9ab6c014c57a971d75854908f7 (diff)
downloadsamba-176ecce9a661c9145620c3f7af9d13025ed0616c.tar.gz
samba-176ecce9a661c9145620c3f7af9d13025ed0616c.tar.xz
samba-176ecce9a661c9145620c3f7af9d13025ed0616c.zip
s4-provision: wipe the old keytabs when provisioning
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/scripting/python/samba/tests')
-rw-r--r--source4/scripting/python/samba/tests/provision.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py
index 37b256a9250..58bb030568e 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/source4/scripting/python/samba/tests/provision.py
@@ -18,7 +18,7 @@
#
import os
-from samba.provision import setup_secretsdb, findnss
+from samba.provision import setup_secretsdb, findnss, ProvisionPaths
import samba.tests
from samba.tests import env_loadparm, TestCase
@@ -36,7 +36,12 @@ def create_dummy_secretsdb(path, lp=None):
"""
if lp is None:
lp = env_loadparm()
- secrets_ldb = setup_secretsdb(path, setup_path, None, None, lp=lp)
+ paths = ProvisionPaths()
+ paths.secrets = path
+ paths.private_dir = os.path.dirname(path)
+ paths.keytab = "no.keytab"
+ paths.dns_keytab = "no.dns.keytab"
+ secrets_ldb = setup_secretsdb(paths, setup_path, None, None, lp=lp)
secrets_ldb.transaction_commit()
return secrets_ldb
@@ -47,7 +52,12 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir):
def test_setup_secretsdb(self):
path = os.path.join(self.tempdir, "secrets.ldb")
- ldb = setup_secretsdb(path, setup_path, None, None, lp=env_loadparm())
+ paths = ProvisionPaths()
+ paths.secrets = path
+ paths.private_dir = os.path.dirname(path)
+ paths.keytab = "no.keytab"
+ paths.dns_keytab = "no.dns.keytab"
+ ldb = setup_secretsdb(paths, setup_path, None, None, lp=env_loadparm())
try:
self.assertEquals("LSA Secrets",
ldb.searchone(basedn="CN=LSA Secrets", attribute="CN"))