From b1daa502935026854758dc47868866b022c53128 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 9 Dec 2010 22:48:16 +0100 Subject: subunitrun: Remove global subunit module when reimporting from a different location. --- source4/scripting/bin/subunitrun | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source4/scripting/bin/subunitrun') diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun index 87519d5661..4078562ab4 100755 --- a/source4/scripting/bin/subunitrun +++ b/source4/scripting/bin/subunitrun @@ -26,7 +26,12 @@ import optparse import samba samba.ensure_external_module("testtools", "testtools") samba.ensure_external_module("subunit", "subunit/python") -from subunit.run import SubunitTestRunner, TestProgram +try: + from subunit.run import SubunitTestRunner, TestProgram +except ImportError: + del sys.modules["subunit"] + samba.import_bundled_package("subunit", "subunit/python") + from subunit.run import SubunitTestRunner, TestProgram import samba.getopt as options import samba.tests -- cgit