diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-03 17:35:54 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:01 +1100 |
| commit | 677f28d8b2d7324817ced7eb5e03343208b6ac86 (patch) | |
| tree | ec0e221e17c1e835e9b16d5ed5c326d9d476987f | |
| parent | 3bcb693e27559d8b4f15be05ef2e921f1bf8cdb2 (diff) | |
| download | samba-677f28d8b2d7324817ced7eb5e03343208b6ac86.tar.gz samba-677f28d8b2d7324817ced7eb5e03343208b6ac86.tar.bz2 samba-677f28d8b2d7324817ced7eb5e03343208b6ac86.zip | |
s4-test: fixed setup/ assumption for top level build
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/scripting/python/samba/tests/provision.py | 4 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/samba3.py | 7 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/samba3sam.py | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py index 29287ff3f2..f6a5571840 100644 --- a/source4/scripting/python/samba/tests/provision.py +++ b/source4/scripting/python/samba/tests/provision.py @@ -20,11 +20,11 @@ """Tests for samba.provision.""" import os -from samba.provision import setup_secretsdb, findnss, ProvisionPaths +from samba.provision import setup_secretsdb, findnss, ProvisionPaths, find_setup_dir import samba.tests from samba.tests import env_loadparm, TestCase -setup_dir = "setup" +setup_dir = find_setup_dir() def setup_path(file): return os.path.join(setup_dir, file) diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py index c55de8b521..3a4b851c75 100644 --- a/source4/scripting/python/samba/tests/samba3.py +++ b/source4/scripting/python/samba/tests/samba3.py @@ -26,8 +26,11 @@ from samba.samba3 import (WinsDatabase, SmbpasswdFile, ACB_NORMAL, from samba.tests import TestCase import os -DATADIR = os.path.join(os.path.dirname(__file__), - "../../../../../testdata/samba3") +for p in [ "../../../../../testdata/samba3", "../../../../testdata/samba3" ]: + DATADIR = os.path.join(os.path.dirname(__file__), p) + if os.path.exists(DATADIR): + break + class RegistryTestCase(TestCase): diff --git a/source4/scripting/python/samba/tests/samba3sam.py b/source4/scripting/python/samba/tests/samba3sam.py index 59b6e5517c..a34f0f620c 100644 --- a/source4/scripting/python/samba/tests/samba3sam.py +++ b/source4/scripting/python/samba/tests/samba3sam.py @@ -31,10 +31,14 @@ import samba.dcerpc.security import samba.ndr from samba.auth import system_session -datadir = os.path.join(os.path.dirname(__file__), - "../../../../../testdata/samba3") def read_datafile(filename): + paths = [ "../../../../../testdata/samba3", + "../../../../testdata/samba3" ] + for p in paths: + datadir = os.path.join(os.path.dirname(__file__), p) + if os.path.exists(datadir): + break return open(os.path.join(datadir, filename), 'r').read() def ldb_debug(l, text): |