diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-19 23:27:38 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:51:59 +0100 |
| commit | c2fffa8335ac68ff70de52f9fc80fb49e5d6d686 (patch) | |
| tree | d8ff9774916e84dbc568f77edd4925b1f6b51735 /source4/scripting/python/samba/tests | |
| parent | 6e2459211dbd59c8884049faa0d63c1712dbadfe (diff) | |
| download | samba-c2fffa8335ac68ff70de52f9fc80fb49e5d6d686.tar.gz samba-c2fffa8335ac68ff70de52f9fc80fb49e5d6d686.tar.xz samba-c2fffa8335ac68ff70de52f9fc80fb49e5d6d686.zip | |
r26538: Pass path generation function around rather than base directory.
(This used to be commit 5f921af41e4dcd6844f6a662d56bd27c4e76ff88)
Diffstat (limited to 'source4/scripting/python/samba/tests')
| -rw-r--r-- | source4/scripting/python/samba/tests/__init__.py | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/provision.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py index 45588ecb5a..e213c1cc1f 100644 --- a/source4/scripting/python/samba/tests/__init__.py +++ b/source4/scripting/python/samba/tests/__init__.py @@ -67,6 +67,6 @@ class SubstituteVarTestCase(unittest.TestCase): class LdbExtensionTests(TestCaseInTempDir): def test_searchone(self): l = samba.Ldb(self.tempdir + "/searchone.ldb") - l.add({"dn": ldb.Dn(l, "foo=dc"), "bar": "bla"}) + l.add({"dn": "foo=dc", "bar": "bla"}) self.assertEquals("bla", l.searchone(ldb.Dn(l, "foo=dc"), "bar")) diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py index c8bd99283b..bf7182dbd3 100644 --- a/source4/scripting/python/samba/tests/provision.py +++ b/source4/scripting/python/samba/tests/provision.py @@ -23,11 +23,14 @@ import samba.tests from ldb import Dn setup_dir = "setup" +def setup_path(file): + return os.path.join(setup_dir, file) + class ProvisionTestCase(samba.tests.TestCaseInTempDir): def test_setup_secretsdb(self): ldb = setup_secretsdb(os.path.join(self.tempdir, "secrets.ldb"), - setup_dir, None, None, None) + setup_path, None, None, None) self.assertEquals("LSA Secrets", ldb.searchone(Dn(ldb, "CN=LSA Secrets"), "CN")) |