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 /source4 | |
| 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 'source4')
| -rwxr-xr-x | source4/dsdb/tests/python/dsdb_schema_info.py | 3 | ||||
| -rw-r--r-- | source4/torture/drs/python/drs_base.py | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/source4/dsdb/tests/python/dsdb_schema_info.py b/source4/dsdb/tests/python/dsdb_schema_info.py index 28fce1b00f4..8f64f1063c0 100755 --- a/source4/dsdb/tests/python/dsdb_schema_info.py +++ b/source4/dsdb/tests/python/dsdb_schema_info.py @@ -30,8 +30,7 @@ import time import random sys.path.insert(0, "bin/python") -import samba -samba.ensure_external_module("testtools", "testtools") +import samba.tests from ldb import SCOPE_BASE, LdbError diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py index f692edc4f57..683987fdb6d 100644 --- a/source4/torture/drs/python/drs_base.py +++ b/source4/torture/drs/python/drs_base.py @@ -24,10 +24,8 @@ import time import os sys.path.insert(0, "bin/python") -import samba +import samba.tests from samba import dsdb -samba.ensure_external_module("testtools", "testtools") -samba.ensure_external_module("subunit", "subunit/python") from ldb import ( SCOPE_BASE, @@ -35,8 +33,6 @@ from ldb import ( FLAG_MOD_REPLACE, ) -import samba.tests - class DrsBaseTestCase(samba.tests.BlackboxTestCase): """Base class implementation for all DRS python tests. |