From 132e505d1edc501edbe73bb75b65c1f5a724e70b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 1 Apr 2010 14:47:54 +0200
Subject: subunitrun: Find testtools and subunit when they're not provided by
 the system.

---
 source4/scripting/bin/subunitrun | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'source4/scripting/bin/subunitrun')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 63afdc7009..7b9f20efa7 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -22,14 +22,16 @@ import sys
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
 
-from subunit.run import SubunitTestRunner
 from unittest import TestProgram
 import optparse
-import os
-from samba import param
+import samba
+samba.ensure_external_module("testtools", "testtools")
+samba.ensure_external_module("subunit", "subunit/python")
 import samba.getopt as options
 import samba.tests
 
+from subunit.run import SubunitTestRunner
+
 parser = optparse.OptionParser("subunitrun [options] <tests>")
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
-- 
cgit