s4-python Ensure we add the Samba python path first.

This exact form of the construction is important, and we match on it
in the installation scripts.

Andrew Bartlett

diff --git a/source4/auth/credentials/tests/bind.py b/source4/auth/credentials/tests/bind.py
index a10c91956f445783d4431f9dd421066033f9f8de..1529a475c71647ffe54fb8b937d4b12c9992baed 100755 (executable)
--- a/source4/auth/credentials/tests/bind.py
+++ b/source4/auth/credentials/tests/bind.py
@@ -10,7 +10,7 @@ import os
 import copy
 import time
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 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 d2c411643f9f7155e3c73e9d73bc52599a215d0b..2902f2550118fe15be388b57a649507871e67839 100755 (executable)
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -6,7 +6,7 @@ import optparse
 import sys
 import base64
 import re
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 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 912579599824b2dd951ea552f38bd961df70f39a..80c6937483384ff1f86dfb1609ca03ebfbde3f21 100755 (executable)
--- a/source4/dsdb/tests/python/deletetest.py
+++ b/source4/dsdb/tests/python/deletetest.py
@@ -5,7 +5,7 @@ import optparse
 import sys
 import os
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 samba.ensure_external_module("testtools", "testtools")
 samba.ensure_external_module("subunit", "subunit/python")

diff --git a/source4/dsdb/tests/python/dsdb_schema_info.py b/source4/dsdb/tests/python/dsdb_schema_info.py
index dc82fe071cbb9a1ac81417298809787689e9df0d..28fce1b00f4a39d9a0890e42c75167b6f2656ac8 100755 (executable)
--- a/source4/dsdb/tests/python/dsdb_schema_info.py
+++ b/source4/dsdb/tests/python/dsdb_schema_info.py
@@ -29,7 +29,7 @@ import sys
 import time
 import random
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 samba.ensure_external_module("testtools", "testtools")
 

diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index 902dfb77d8ba12c3e74cfeec9752e950cf9b1ce4..2b7e8fa4d1ea4cdde0b53a62d6cb7791fb6d9d38 100755 (executable)
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -8,7 +8,7 @@ import time
 import base64
 import os
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 samba.ensure_external_module("testtools", "testtools")
 samba.ensure_external_module("subunit", "subunit/python")

diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py
index 3dcbb72a023f34101973cf6fb5bf2176a19b5827..a6503e263928990bf0a8a324bc22c6591dd1a671 100755 (executable)
--- a/source4/dsdb/tests/python/ldap_schema.py
+++ b/source4/dsdb/tests/python/ldap_schema.py
@@ -8,7 +8,7 @@ import time
 import random
 import os
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 samba.ensure_external_module("testtools", "testtools")
 samba.ensure_external_module("subunit", "subunit/python")

diff --git a/source4/dsdb/tests/python/ldap_syntaxes.py b/source4/dsdb/tests/python/ldap_syntaxes.py
index 04b95d7a8a80834ba4a825e112094251fa23ba21..64e0c421c14cef30cb6e464ec517176db16d776c 100644 (file)
--- a/source4/dsdb/tests/python/ldap_syntaxes.py
+++ b/source4/dsdb/tests/python/ldap_syntaxes.py
@@ -8,7 +8,7 @@ import time
 import random
 import uuid
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 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 70bca933f6ec48b708307b50fc656aba5789cd3f..0db5e8c10c49bdb822fbff95c5fd4a4b058697a4 100755 (executable)
--- a/source4/dsdb/tests/python/passwords.py
+++ b/source4/dsdb/tests/python/passwords.py
@@ -14,7 +14,7 @@ import base64
 import time
 import os
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 samba.ensure_external_module("testtools", "testtools")
 samba.ensure_external_module("subunit", "subunit/python")

diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index 69dd7570482db8f8b50984481f0cb44b7d0151e7..a623ebc384fe638c5884cab70068a23569427370 100755 (executable)
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -6,7 +6,7 @@ import optparse
 import sys
 import os
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 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 de71daee69d6ac9c742cfb9a2b38fef623750e69..2db33ae340c9fc565317c181f98b2f7315a2bd57 100755 (executable)
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -8,7 +8,7 @@ import base64
 import re
 import random
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 samba.ensure_external_module("testtools", "testtools")
 samba.ensure_external_module("subunit", "subunit/python")

diff --git a/source4/dsdb/tests/python/token_group.py b/source4/dsdb/tests/python/token_group.py
index e3ffbac2d549f921f665feb9eb11236a4b0deb13..62bdbd5ee03ac40673ba5d5f2d295733f00cfaf6 100755 (executable)
--- a/source4/dsdb/tests/python/token_group.py
+++ b/source4/dsdb/tests/python/token_group.py
@@ -6,7 +6,7 @@ import optparse
 import sys
 import os
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 samba.ensure_external_module("testtools", "testtools")
 samba.ensure_external_module("subunit", "subunit/python")

diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py
index bf92d0a9682904bd56ba22ce06650ddcfea67267..3759c82de87fd5b685c70b6968fa773a42dd5fb6 100755 (executable)
--- a/source4/dsdb/tests/python/urgent_replication.py
+++ b/source4/dsdb/tests/python/urgent_replication.py
@@ -5,7 +5,7 @@ import optparse
 import sys
 import os
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 samba.ensure_external_module("testtools", "testtools")
 samba.ensure_external_module("subunit", "subunit/python")

diff --git a/source4/scripting/devel/speedtest.py b/source4/scripting/devel/speedtest.py
index a7adfbace17457e59332ccf554a559699e861617..fed270527a07b317f285383337bed792bffc88d5 100755 (executable)
--- a/source4/scripting/devel/speedtest.py
+++ b/source4/scripting/devel/speedtest.py
@@ -28,7 +28,7 @@ import time
 import base64
 from decimal import Decimal
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 samba.ensure_external_module("testtools", "testtools")
 samba.ensure_external_module("subunit", "subunit/python")

diff --git a/source4/torture/drs/python/delete_object.py b/source4/torture/drs/python/delete_object.py
index ccc412e1712c0df4bff7045ad7e0bb2517c2f537..c52060f94336c1e579a9b11dd729cf178243a7c4 100644 (file)
--- a/source4/torture/drs/python/delete_object.py
+++ b/source4/torture/drs/python/delete_object.py
@@ -30,7 +30,7 @@ import sys
 import time
 import os
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 
 from ldb import (
     SCOPE_BASE,

diff --git a/source4/torture/drs/python/fsmo.py b/source4/torture/drs/python/fsmo.py
index 4dc573b89c343c06e720f984d40bf0a948c541c7..d7b3c1671daf8ac7099aace2d91690aa87e52a51 100644 (file)
--- a/source4/torture/drs/python/fsmo.py
+++ b/source4/torture/drs/python/fsmo.py
@@ -29,7 +29,7 @@ import sys
 import time
 import os
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 
 from ldb import SCOPE_BASE
 

diff --git a/source4/torture/drs/python/repl_schema.py b/source4/torture/drs/python/repl_schema.py
index a98452ed13f7c4b9af4eba35813b051ac40a282a..db14c37adf15eea6521936542751928dfa6209c1 100644 (file)
--- a/source4/torture/drs/python/repl_schema.py
+++ b/source4/torture/drs/python/repl_schema.py
@@ -32,7 +32,7 @@ import time
 import random
 import os
 
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
 import samba
 samba.ensure_external_module("testtools", "testtools")
 samba.ensure_external_module("subunit", "subunit/python")