From 28577aae928847e64a0274b5922e26e1f15d9916 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 8 Jan 2010 02:09:20 +0100
Subject: Import testtools as well, required for subunit.

---
 source4/scripting/bin/subunitrun   | 3 +--
 source4/scripting/python/config.mk | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 62717a78a9..6cd3943786 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -21,9 +21,8 @@ import sys
 
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
-sys.path.insert(1, "../lib/subunit/python")
 
-from subunit import SubunitTestRunner
+from subunit.run import SubunitTestRunner
 from unittest import TestProgram
 import optparse
 import os
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index a5e3f25d59..3d255de00e 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -30,6 +30,6 @@ $(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubs
 EPYDOC_OPTIONS = --no-private --url http://www.samba.org/ --no-sourcecode
 
 epydoc:: pythonmods
-	PYTHONPATH=$(pythonbuilddir):../lib/subunit/python epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit
+	PYTHONPATH=$(pythonbuilddir):../lib/subunit/python epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit testtools
 
 install:: installpython
-- 
cgit