diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-08 03:33:38 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-08 03:33:38 +0200 |
| commit | f8a02a1a804fdb8640989595e2b57df86281c0f7 (patch) | |
| tree | 6e7a2acd00954d93102be0e89693b7c2ae319f02 | |
| parent | df4e9c7066059f072420d869ba6d2f383838afad (diff) | |
| download | samba-f8a02a1a804fdb8640989595e2b57df86281c0f7.tar.gz samba-f8a02a1a804fdb8640989595e2b57df86281c0f7.tar.bz2 samba-f8a02a1a804fdb8640989595e2b57df86281c0f7.zip | |
Fix subunit files location after cherrypicks.
| -rw-r--r-- | lib/subunit/python/subunit/__init__.py (renamed from lib/subunit/python/__init__.py) | 0 | ||||
| -rw-r--r-- | lib/subunit/python/subunit/tests/TestUtil.py (renamed from lib/subunit/python/tests/TestUtil.py) | 0 | ||||
| -rw-r--r-- | lib/subunit/python/subunit/tests/__init__.py (renamed from lib/subunit/python/tests/__init__.py) | 0 | ||||
| -rwxr-xr-x | lib/subunit/python/subunit/tests/sample-script.py (renamed from lib/subunit/python/tests/sample-script.py) | 0 | ||||
| -rwxr-xr-x | lib/subunit/python/subunit/tests/sample-two-script.py (renamed from lib/subunit/python/tests/sample-two-script.py) | 0 | ||||
| -rw-r--r-- | lib/subunit/python/subunit/tests/test_test_protocol.py (renamed from lib/subunit/python/tests/test_test_protocol.py) | 0 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/python/ldap.py | 1 | ||||
| -rwxr-xr-x | source4/scripting/bin/subunitrun | 2 |
8 files changed, 2 insertions, 1 deletions
diff --git a/lib/subunit/python/__init__.py b/lib/subunit/python/subunit/__init__.py index 406cd8765b..406cd8765b 100644 --- a/lib/subunit/python/__init__.py +++ b/lib/subunit/python/subunit/__init__.py diff --git a/lib/subunit/python/tests/TestUtil.py b/lib/subunit/python/subunit/tests/TestUtil.py index 1b5ba9c293..1b5ba9c293 100644 --- a/lib/subunit/python/tests/TestUtil.py +++ b/lib/subunit/python/subunit/tests/TestUtil.py diff --git a/lib/subunit/python/tests/__init__.py b/lib/subunit/python/subunit/tests/__init__.py index 544d0e704f..544d0e704f 100644 --- a/lib/subunit/python/tests/__init__.py +++ b/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 index 223d2f5d9f..223d2f5d9f 100755 --- a/lib/subunit/python/tests/sample-script.py +++ b/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 index d5550842bf..d5550842bf 100755 --- a/lib/subunit/python/tests/sample-two-script.py +++ b/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 index af31584a97..af31584a97 100644 --- a/lib/subunit/python/tests/test_test_protocol.py +++ b/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 6c910b63f1..e2cc658521 100755 --- 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 bc35c7ce22..e7737bdbec 100755 --- 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 |