From 636d8cfb423bbdf271df25efbc13c91420ebefe8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 10 Dec 2010 00:47:33 +0100 Subject: s4-python: Add convenience function for forcibly importing bundled package. --- source4/scripting/bin/subunitrun | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source4/scripting/bin') diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun index 9717c9e345..21243a73ec 100755 --- a/source4/scripting/bin/subunitrun +++ b/source4/scripting/bin/subunitrun @@ -29,10 +29,8 @@ samba.ensure_external_module("subunit", "subunit/python") try: from subunit.run import SubunitTestRunner, TestProgram except ImportError: - del sys.modules["subunit"] - if "subunit.run" in sys.modules: - del sys.modules["subunit.run"] - samba.import_bundled_package("subunit", "subunit/python") + samba.force_bundled_package("testtools", "testtools") + samba.force_bundled_package("subunit", "subunit/python") from subunit.run import SubunitTestRunner, TestProgram import samba.getopt as options import samba.tests -- cgit