diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-11-04 20:37:41 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2014-11-30 20:54:03 +0100 |
| commit | 7dbc58f524fbde517966d671da138b69566929d7 (patch) | |
| tree | 3eeb2963d4de9f34b99f43d2bc4706dba993e679 /python | |
| parent | 4323504921ff0a566c43dada90443bdad3162f9b (diff) | |
| download | samba-7dbc58f524fbde517966d671da138b69566929d7.tar.gz | |
Reduce number of places where sys.path is (possibly) updated for external module paths.
Change-Id: I69d060f27ea090d14405e884d1ce271975358c56
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Sun Nov 30 20:54:04 CET 2014 on sn-devel-104
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/tests/__init__.py | 2 | ||||
| -rwxr-xr-x | python/samba/tests/subunitrun.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py index 8d3b4dd152d..8e662ed1564 100644 --- a/python/samba/tests/__init__.py +++ b/python/samba/tests/__init__.py @@ -26,6 +26,8 @@ from samba.samdb import SamDB import subprocess import tempfile +samba.ensure_external_module("mimeparse", "mimeparse") +samba.ensure_external_module("extras", "extras") samba.ensure_external_module("testtools", "testtools") # Other modules import these two classes from here, for convenience: diff --git a/python/samba/tests/subunitrun.py b/python/samba/tests/subunitrun.py index d45467607e6..291e7ab461a 100755 --- a/python/samba/tests/subunitrun.py +++ b/python/samba/tests/subunitrun.py @@ -37,9 +37,7 @@ signal.signal(signal.SIGINT, signal.SIG_DFL) import optparse import samba import sys -samba.ensure_external_module("mimeparse", "mimeparse") -samba.ensure_external_module("extras", "extras") -samba.ensure_external_module("testtools", "testtools") +import samba.tests samba.ensure_external_module("subunit", "subunit/python") import subunit.run |