summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsource4/scripting/bin/subunitrun7
1 files changed, 6 insertions, 1 deletions
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