Fix subunit files location after cherrypicks.

diff --git a/lib/subunit/python/__init__.py b/lib/subunit/python/subunit/__init__.py
similarity index 100%
rename from lib/subunit/python/__init__.py
rename to lib/subunit/python/subunit/__init__.py

diff --git a/lib/subunit/python/tests/TestUtil.py b/lib/subunit/python/subunit/tests/TestUtil.py
similarity index 100%
rename from lib/subunit/python/tests/TestUtil.py
rename to lib/subunit/python/subunit/tests/TestUtil.py

diff --git a/lib/subunit/python/tests/__init__.py b/lib/subunit/python/subunit/tests/__init__.py
similarity index 100%
rename from lib/subunit/python/tests/__init__.py
rename to lib/subunit/python/subunit/tests/__init__.py

diff --git a/lib/subunit/python/tests/sample-script.py b/lib/subunit/python/subunit/tests/sample-script.py
similarity index 100%
rename from lib/subunit/python/tests/sample-script.py
rename to lib/subunit/python/subunit/tests/sample-script.py

diff --git a/lib/subunit/python/tests/sample-two-script.py b/lib/subunit/python/subunit/tests/sample-two-script.py
similarity index 100%
rename from lib/subunit/python/tests/sample-two-script.py
rename to lib/subunit/python/subunit/tests/sample-two-script.py

diff --git a/lib/subunit/python/tests/test_test_protocol.py b/lib/subunit/python/subunit/tests/test_test_protocol.py
similarity index 100%
rename from lib/subunit/python/tests/test_test_protocol.py
rename to lib/subunit/python/subunit/tests/test_test_protocol.py

diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index 6c910b63f1b450e1de9c63ae7561d9120241ec55..e2cc65852121561d87bc2fcbb6e03a070ab18077 100755 (executable)
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -8,6 +8,7 @@ import sys
 import time
 
 sys.path.append("bin/python")
+sys.path.append("../lib/subunit/python")
 
 import samba.getopt as options
 

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index bc35c7ce22880ae53b9e2b47f50e654d364e66d1..e7737bdbecc354f91e8f0142f13a2af851fd3898 100755 (executable)
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -21,7 +21,7 @@ import sys
 
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
-sys.path.insert(0, "../lib/subunit/python")
+sys.path.insert(1, "../lib/subunit/python")
 
 from subunit import SubunitTestRunner
 from unittest import TestProgram