s4:ldb/python: make it possible to run tests standalone

metze

diff --git a/source4/lib/ldb/tests/python/acl.py b/source4/lib/ldb/tests/python/acl.py
index 514edf87a22600056cdc5a8134f2515261ce8725..5bf3ff9b1b9e499da434e5c39980af5174af9028 100755 (executable)
--- a/source4/lib/ldb/tests/python/acl.py
+++ b/source4/lib/ldb/tests/python/acl.py
@@ -8,6 +8,9 @@ import base64
 import re
 
 sys.path.append("bin/python")
+import samba
+samba.ensure_external_module("subunit", "subunit/python")
+samba.ensure_external_module("testtools", "testtools")
 
 import samba.getopt as options
 

diff --git a/source4/lib/ldb/tests/python/deletetest.py b/source4/lib/ldb/tests/python/deletetest.py
index 44eb919e0917cd6a5f09adc239640aba8d39ae2e..aa93104c04f63e9351fc1a34950699bed7bb2796 100755 (executable)
--- a/source4/lib/ldb/tests/python/deletetest.py
+++ b/source4/lib/ldb/tests/python/deletetest.py
@@ -7,7 +7,7 @@ import os
 
 sys.path.append("bin/python")
 import samba
-samba.ensure_external_module("subunit", "subunit")
+samba.ensure_external_module("subunit", "subunit/python")
 samba.ensure_external_module("testtools", "testtools")
 
 import samba.getopt as options

diff --git a/source4/lib/ldb/tests/python/dsdb_schema_info.py b/source4/lib/ldb/tests/python/dsdb_schema_info.py
index 7a3faba459df8368d0747b2ca72376b36b4dd7ca..ff3c7f9b9857bc930e215c9ec9631f871c4d40e0 100755 (executable)
--- a/source4/lib/ldb/tests/python/dsdb_schema_info.py
+++ b/source4/lib/ldb/tests/python/dsdb_schema_info.py
@@ -31,6 +31,9 @@ import random
 import os
 
 sys.path.append("bin/python")
+import samba
+samba.ensure_external_module("subunit", "subunit/python")
+samba.ensure_external_module("testtools", "testtools")
 
 from samba.auth import system_session
 from ldb import SCOPE_BASE, LdbError

diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index 3a0a1c0a7f3366f9cc06373930ef5e2b205fc19d..de8e89b7f84fd62053cc86f613834f6c80ec9198 100755 (executable)
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -9,6 +9,9 @@ import base64
 import os
 
 sys.path.append("bin/python")
+import samba
+samba.ensure_external_module("subunit", "subunit/python")
+samba.ensure_external_module("testtools", "testtools")
 
 import samba.getopt as options
 

diff --git a/source4/lib/ldb/tests/python/ldap_schema.py b/source4/lib/ldb/tests/python/ldap_schema.py
index 8d1f0d00f45e5927075625dc8c9132814dd58d56..270e22adb19ac67dce2a669481cd521be7185685 100755 (executable)
--- a/source4/lib/ldb/tests/python/ldap_schema.py
+++ b/source4/lib/ldb/tests/python/ldap_schema.py
@@ -9,6 +9,9 @@ import random
 import os
 
 sys.path.append("bin/python")
+import samba
+samba.ensure_external_module("subunit", "subunit/python")
+samba.ensure_external_module("testtools", "testtools")
 
 import samba.getopt as options
 

diff --git a/source4/lib/ldb/tests/python/passwords.py b/source4/lib/ldb/tests/python/passwords.py
index dd5a1ca1262e14b1539800ce7a5f1bae3f3187b4..fd2ed1c105a33c6a6da013caa456c70c01dab6ff 100755 (executable)
--- a/source4/lib/ldb/tests/python/passwords.py
+++ b/source4/lib/ldb/tests/python/passwords.py
@@ -16,6 +16,9 @@ import base64
 import os
 
 sys.path.append("bin/python")
+import samba
+samba.ensure_external_module("subunit", "subunit/python")
+samba.ensure_external_module("testtools", "testtools")
 
 import samba.getopt as options
 

diff --git a/source4/lib/ldb/tests/python/sec_descriptor.py b/source4/lib/ldb/tests/python/sec_descriptor.py
index 91f607714e0971af6ccc376d44e0ae2952a3fe3d..8dc77321b4193a9d23c30e578c1dabf084615c0a 100755 (executable)
--- a/source4/lib/ldb/tests/python/sec_descriptor.py
+++ b/source4/lib/ldb/tests/python/sec_descriptor.py
@@ -9,6 +9,9 @@ import re
 import random
 
 sys.path.append("bin/python")
+import samba
+samba.ensure_external_module("subunit", "subunit/python")
+samba.ensure_external_module("testtools", "testtools")
 
 import samba.getopt as options
 

diff --git a/source4/lib/ldb/tests/python/urgent_replication.py b/source4/lib/ldb/tests/python/urgent_replication.py
index 26f7d9b46dc7028749a25b3059a8a9e7c5afdc15..5e9f4ad128fbaba3dbbf99eaf8a210861bd48b76 100755 (executable)
--- a/source4/lib/ldb/tests/python/urgent_replication.py
+++ b/source4/lib/ldb/tests/python/urgent_replication.py
@@ -6,8 +6,9 @@ import sys
 import os
 
 sys.path.append("bin/python")
-sys.path.append("../lib/subunit/python")
-sys.path.append("../lib/testtools")
+import samba
+samba.ensure_external_module("subunit", "subunit/python")
+samba.ensure_external_module("testtools", "testtools")
 
 import samba.getopt as options