[PATCH 02/13] selftest: Reduce number of ensure_external_module calls.

[Jelmer Vernooij]

Change-Id: Ied4440dcddd5c966c3ac5569489ea6f51d9fb156
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
---
 selftest/filter-subunit   | 6 ------
 selftest/format-subunit   | 6 ------
 selftest/subunithelper.py | 6 ++++++
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/selftest/filter-subunit b/selftest/filter-subunit
index 4f95546..1939f88 100755
--- a/selftest/filter-subunit
+++ b/selftest/filter-subunit
@@ -23,12 +23,6 @@ import sys
 import signal
 
 sys.path.insert(0, "bin/python")
-import samba
-samba.ensure_external_module("mimeparse", "mimeparse")
-samba.ensure_external_module("extras", "extras")
-samba.ensure_external_module("testtools", "testtools")
-samba.ensure_external_module("subunit", "subunit/python")
-
 import subunithelper
 
 parser = optparse.OptionParser("filter-subunit [options] < instream > outstream")
diff --git a/selftest/format-subunit b/selftest/format-subunit
index 58321bf..8ebe17f 100755
--- a/selftest/format-subunit
+++ b/selftest/format-subunit
@@ -10,12 +10,6 @@ import signal
 import sys
 
 sys.path.insert(0, "bin/python")
-import samba
-samba.ensure_external_module("mimeparse", "mimeparse")
-samba.ensure_external_module("extras", "extras")
-samba.ensure_external_module("testtools", "testtools")
-samba.ensure_external_module("subunit", "subunit/python")
-
 import subunithelper
 
 parser = optparse.OptionParser("format-subunit [options]")
diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index 3a96843..826d220 100644
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -17,6 +17,12 @@
 
 __all__ = ['parse_results']
 
+import samba
+samba.ensure_external_module("mimeparse", "mimeparse")
+samba.ensure_external_module("extras", "extras")
+samba.ensure_external_module("testtools", "testtools")
+samba.ensure_external_module("subunit", "subunit/python")
+
 import re
 import sys
 import subunit
-- 
2.1.3