[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  74f36df... selftest: Update sys.path before attempting to import external modules.
      from  c6b1553... selftest: Make sure format-subunit and filter-subunit can find testtools/subunit.

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


- Log -----------------------------------------------------------------
commit 74f36df4b30601417dc69031bf6f1af4c652e440
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Mar 31 04:52:13 2010 +0200

    selftest: Update sys.path before attempting to import external modules.

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

Summary of changes:
 selftest/filter-subunit |    3 ++-
 selftest/format-subunit |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/filter-subunit b/selftest/filter-subunit
index 41d92c9..605a898 100755
--- a/selftest/filter-subunit
+++ b/selftest/filter-subunit
@@ -5,13 +5,14 @@
 
 import optparse
 import os
-import subunithelper
 import sys
 import signal
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/subunit/python"))
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/testtools"))
 
+import subunithelper
+
 parser = optparse.OptionParser("filter-subunit [options] < instream > outstream")
 parser.add_option("--expected-failures", type="string", 
 	help="File containing list of regexes matching tests to consider known "
diff --git a/selftest/format-subunit b/selftest/format-subunit
index e590652..54949df 100755
--- a/selftest/format-subunit
+++ b/selftest/format-subunit
@@ -8,12 +8,13 @@ import optparse
 import os
 import signal
 import sys
-import subunithelper
-import subunit
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/subunit/python"))
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../lib/testtools"))
 
+import subunithelper
+import subunit
+
 class PlainFormatter(object):
 
     def __init__(self, summaryfile, verbose, immediate, statistics,


-- 
Samba Shared Repository