From 7dbc58f524fbde517966d671da138b69566929d7 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 4 Nov 2014 20:37:41 +0000 Subject: Reduce number of places where sys.path is (possibly) updated for external module paths. Change-Id: I69d060f27ea090d14405e884d1ce271975358c56 Signed-Off-By: Jelmer Vernooij Reviewed-by: Andrew Bartlett Autobuild-User(master): Jelmer Vernooij Autobuild-Date(master): Sun Nov 30 20:54:04 CET 2014 on sn-devel-104 --- python/samba/tests/__init__.py | 2 ++ python/samba/tests/subunitrun.py | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'python') diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py index 8d3b4dd152..8e662ed156 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 d45467607e..291e7ab461 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 -- cgit