subunitrun: Remove global subunit module when reimporting from a

different location.

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 87519d56617d45c11cebedd3193e9609e3bdbe8f..4078562ab440e1e4a670c1a92bd669147fa649b9 100755 (executable)
--- 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