[PATCH 08/17] Use bundled extras when the system doesn't provide it.
Jelmer Vernooij
jelmer at samba.org
Sat Nov 1 13:22:00 MDT 2014
Change-Id: I188bb89b14d98e6ad8ad03e1ca08a012430b6f62
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
---
auth/credentials/tests/bind.py | 3 +--
source4/dsdb/tests/python/acl.py | 1 +
source4/dsdb/tests/python/deletetest.py | 1 +
source4/dsdb/tests/python/password_lockout.py | 2 +-
source4/dsdb/tests/python/passwords.py | 1 +
source4/dsdb/tests/python/sec_descriptor.py | 1 +
source4/scripting/bin/subunitrun | 7 ++++---
7 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/auth/credentials/tests/bind.py b/auth/credentials/tests/bind.py
index aa4b17a..1ecbdac 100755
--- a/auth/credentials/tests/bind.py
+++ b/auth/credentials/tests/bind.py
@@ -5,13 +5,12 @@
import optparse
import sys
import base64
-import re
-import os
import copy
import time
sys.path.insert(0, "bin/python")
import samba
+samba.ensure_external_module("extras", "extras")
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index a8c3b12..5c2a257 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -8,6 +8,7 @@ import base64
import re
sys.path.insert(0, "bin/python")
import samba
+samba.ensure_external_module("extras", "extras")
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py
index ce972ab..43bb158 100755
--- a/source4/dsdb/tests/python/deletetest.py
+++ b/source4/dsdb/tests/python/deletetest.py
@@ -7,6 +7,7 @@ import os
sys.path.insert(0, "bin/python")
import samba
+samba.ensure_external_module("extras", "extras")
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/password_lockout.py b/source4/dsdb/tests/python/password_lockout.py
index 89e5d69..b77209a 100755
--- a/source4/dsdb/tests/python/password_lockout.py
+++ b/source4/dsdb/tests/python/password_lockout.py
@@ -11,10 +11,10 @@ import optparse
import sys
import base64
import time
-import os
sys.path.insert(0, "bin/python")
import samba
+samba.ensure_external_module("extras", "extras")
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py
index 0db5e8c..83e29fa 100755
--- a/source4/dsdb/tests/python/passwords.py
+++ b/source4/dsdb/tests/python/passwords.py
@@ -16,6 +16,7 @@ import os
sys.path.insert(0, "bin/python")
import samba
+samba.ensure_external_module("extras", "extras")
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index 10d3718..5b9816b 100755
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -10,6 +10,7 @@ import random
sys.path.insert(0, "bin/python")
import samba
+samba.ensure_external_module("extras", "extras")
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 918195e..6563c88 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -11,17 +11,17 @@
# script.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007-2011
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
@@ -39,6 +39,7 @@ sys.path.insert(0, "bin/python")
import optparse
import samba
+samba.ensure_external_module("extras", "extras")
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
from subunit.run import SubunitTestRunner
--
2.1.1
More information about the samba-technical
mailing list