summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-09-26 18:37:56 +0200
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-09-30 16:01:32 +0200
commit9e7fb6a673f9251f00425f7217ebcdf86a1ed42d (patch)
tree5ba82a80fbb1c7c810c81a1a74186fa1e282e5f6 /source4
parentad549072aa72ce27fd58246b92888d8299043398 (diff)
downloadsamba-9e7fb6a673f9251f00425f7217ebcdf86a1ed42d.tar.gz
samba-9e7fb6a673f9251f00425f7217ebcdf86a1ed42d.tar.bz2
samba-9e7fb6a673f9251f00425f7217ebcdf86a1ed42d.zip
s4:samba.tests.samdb - remove last relicts of the templates
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/tests/samdb.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index 8c7bb0ae98..d56f75b314 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -19,7 +19,7 @@
from samba.auth import system_session
from samba.credentials import Credentials
import os
-from samba.provision import setup_samdb, guess_names, setup_templatesdb, make_smbconf, find_setup_dir
+from samba.provision import setup_samdb, guess_names, make_smbconf, find_setup_dir
from samba.samdb import SamDB
from samba.tests import TestCaseInTempDir
from samba.dcerpc import security
@@ -71,8 +71,6 @@ class SamDBTestCase(TestCaseInTempDir):
serverrole=serverrole,
domaindn=self.domaindn, configdn=configdn,
schemadn=schemadn)
- setup_templatesdb(os.path.join(self.tempdir, "templates.ldb"),
- self.setup_path, session_info=session_info, lp=self.lp)
self.samdb = setup_samdb(path, self.setup_path, session_info, creds,
self.lp, names,
lambda x: None, domainsid,
@@ -82,7 +80,7 @@ class SamDBTestCase(TestCaseInTempDir):
"secret", "domain controller")
def tearDown(self):
- for f in ['templates.ldb', 'schema.ldb', 'configuration.ldb',
+ for f in ['schema.ldb', 'configuration.ldb',
'users.ldb', 'samdb.ldb', 'smb.conf']:
os.remove(os.path.join(self.tempdir, f))
super(SamDBTestCase, self).tearDown()