diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-21 21:33:30 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-21 22:54:37 -0700 |
| commit | 118c6548bbc4d1ff889688372190a4503fc2855f (patch) | |
| tree | 84eb2ba4e47a4da3e08ab3a5d1f35772f689bea8 | |
| parent | 7c1b00f4a80ee5eb91333cad9c27ba699c6b2e3b (diff) | |
| download | samba-118c6548bbc4d1ff889688372190a4503fc2855f.tar.gz samba-118c6548bbc4d1ff889688372190a4503fc2855f.tar.xz samba-118c6548bbc4d1ff889688372190a4503fc2855f.zip | |
selftest: Fix run for systems without testtools installed.
| -rw-r--r-- | source4/scripting/python/pyglue.c | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/__init__.py | 1 | ||||
| -rwxr-xr-x | source4/selftest/tests.sh | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c index ec15e77a937..1f968e16f9b 100644 --- a/source4/scripting/python/pyglue.c +++ b/source4/scripting/python/pyglue.c @@ -110,8 +110,6 @@ static PyObject *py_set_debug_level(PyObject *self, PyObject *args) Py_RETURN_NONE; } - - /* return the list of interface IPs we have configured takes an loadparm context, returns a list of IPs in string form diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index 72bbb4a7e35..fb71110600c 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -52,6 +52,7 @@ class Ldb(_Ldb): not necessarily the Sam database. For Sam-specific helper functions see samdb.py. """ + def __init__(self, url=None, lp=None, modules_dir=None, session_info=None, credentials=None, flags=0, options=None): """Opens a Samba Ldb file. diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh index 719f4a65b14..596604b6279 100755 --- a/source4/selftest/tests.sh +++ b/source4/selftest/tests.sh @@ -104,7 +104,7 @@ planpythontestsuite() { env=$2 module="$3" shift 3 - plantestsuite_idlist "$name" "$env" python -m subunit.run $module + plantestsuite_idlist "$name" "$env" PYTHONPATH=$samba4srcdir/../lib/subunit/python:$samba4srcdir/../lib/testtools $PYTHON -m subunit.run $module } plansmbtorturetestsuite() { |