summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb/ldb_modules
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-25 16:36:53 -0600
committerStefan Metzmacher <metze@samba.org>2007-12-26 11:57:08 -0600
commit43a03b0fb48ceb528539a16b0023fb5b30b7a79e (patch)
tree70102e3e78475c0f3845157b2d720503cca350c8 /source4/dsdb/samdb/ldb_modules
parent327847b98765e29a10f70e2b7512bd9acd6a0570 (diff)
downloadsamba-43a03b0fb48ceb528539a16b0023fb5b30b7a79e.tar.gz
samba-43a03b0fb48ceb528539a16b0023fb5b30b7a79e.tar.bz2
samba-43a03b0fb48ceb528539a16b0023fb5b30b7a79e.zip
r26598: Simplify the way Python tests are run.
(This used to be commit d649f73431fc993e31522e7fc8e1e35e0a4421d8)
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules')
-rw-r--r--source4/dsdb/samdb/ldb_modules/tests/samba3sam.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
index 8ca92e152e..b083b68da6 100644
--- a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
@@ -1034,18 +1034,18 @@ revision: 2
self.samba4.connect()
def tearDown(self):
- super(Samba3SamTestCase, self).tearDown()
os.unlink(self.ldbfile)
os.unlink(self.samba3.file)
os.unlink(self.templates.file)
os.unlink(self.samba4.file)
+ super(Samba3SamTestCase, self).tearDown()
def test_s3sam(self):
ldb = Ldb(self.ldburl)
self.setup_data(self.samba3, open(os.path.join(datadir, "samba3.ldif"), 'r').read())
self.setup_data(self.templates, open(os.path.join(datadir, "provision_samba3sam_templates.ldif"), 'r').read())
ldif = open(os.path.join(datadir, "provision_samba3sam.ldif"), 'r').read()
- ldb.add_ldif(substitute_var(ldif, s4.substvars))
+ ldb.add_ldif(substitute_var(ldif, self.samba4.substvars))
self.setup_modules(ldb, self.samba3, self.samba4)
ldb = Ldb(self.ldburl)
@@ -1057,7 +1057,7 @@ revision: 2
ldb = Ldb(self.ldburl)
self.setup_data(self.templates, open(os.path.join(datadir, "provision_samba3sam_templates.ldif"), 'r').read())
ldif = open(os.path.join(datadir, "provision_samba3sam.ldif"), 'r').read()
- ldb.add_ldif(substitute_var(ldif, s4.substvars))
+ ldb.add_ldif(substitute_var(ldif, self.samba4.substvars))
self.setup_modules(ldb, self.samba3, self.samba4)
ldb = Ldb(self.ldburl)