[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  132e505... subunitrun: Find testtools and subunit when they're not provided by the system.
      from  a2411c5... s3:winbindd: correctly invalidate the cached connection

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 132e505d1edc501edbe73bb75b65c1f5a724e70b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Apr 1 14:47:54 2010 +0200

    subunitrun: Find testtools and subunit when they're not provided by the
    system.

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/bin/subunitrun |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 63afdc7..7b9f20e 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)


-- 
Samba Shared Repository