diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-01-08 02:09:20 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-01-16 19:53:49 +1300 |
| commit | 28577aae928847e64a0274b5922e26e1f15d9916 (patch) | |
| tree | 78f6b36e8166d3320120df0e1bc91fef7ce8f9b1 /source4/lib | |
| parent | b6b46b4978dcaffa0cd9803c43b8a5f1c19e227e (diff) | |
| download | samba-28577aae928847e64a0274b5922e26e1f15d9916.tar.gz samba-28577aae928847e64a0274b5922e26e1f15d9916.tar.bz2 samba-28577aae928847e64a0274b5922e26e1f15d9916.zip | |
Import testtools as well, required for subunit.
Diffstat (limited to 'source4/lib')
| -rwxr-xr-x | source4/lib/ldb/tests/python/acl.py | 3 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/python/ldap.py | 3 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/python/ldap_schema.py | 3 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/python/sec_descriptor.py | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/source4/lib/ldb/tests/python/acl.py b/source4/lib/ldb/tests/python/acl.py index 909adc5129..05c351008b 100755 --- a/source4/lib/ldb/tests/python/acl.py +++ b/source4/lib/ldb/tests/python/acl.py @@ -10,7 +10,6 @@ import base64 import re sys.path.append("bin/python") -sys.path.append("../lib/subunit/python") import samba.getopt as options @@ -25,7 +24,7 @@ from samba.dcerpc import security from samba.auth import system_session from samba import Ldb -from subunit import SubunitTestRunner +from subunit.run import SubunitTestRunner import unittest parser = optparse.OptionParser("ldap [options] <host>") diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py index c90727d720..603e1923ec 100755 --- a/source4/lib/ldb/tests/python/ldap.py +++ b/source4/lib/ldb/tests/python/ldap.py @@ -11,7 +11,6 @@ import base64 import os sys.path.append("bin/python") -sys.path.append("../lib/subunit/python") import samba.getopt as options @@ -44,7 +43,7 @@ from samba import ATYPE_DISTRIBUTION_GLOBAL_GROUP from samba import ATYPE_DISTRIBUTION_LOCAL_GROUP from samba import ATYPE_DISTRIBUTION_UNIVERSAL_GROUP -from subunit import SubunitTestRunner +from subunit.run import SubunitTestRunner import unittest from samba.ndr import ndr_pack, ndr_unpack diff --git a/source4/lib/ldb/tests/python/ldap_schema.py b/source4/lib/ldb/tests/python/ldap_schema.py index 69b48cb867..201711d714 100755 --- a/source4/lib/ldb/tests/python/ldap_schema.py +++ b/source4/lib/ldb/tests/python/ldap_schema.py @@ -11,7 +11,6 @@ import base64 import os sys.path.append("bin/python") -sys.path.append("../lib/subunit/python") import samba.getopt as options @@ -45,7 +44,7 @@ from samba import ATYPE_DISTRIBUTION_LOCAL_GROUP from samba import ATYPE_DISTRIBUTION_UNIVERSAL_GROUP from samba import DS_DC_FUNCTION_2003 -from subunit import SubunitTestRunner +from subunit.run import SubunitTestRunner import unittest from samba.ndr import ndr_pack, ndr_unpack diff --git a/source4/lib/ldb/tests/python/sec_descriptor.py b/source4/lib/ldb/tests/python/sec_descriptor.py index 4589178a42..84edd90f7d 100755 --- a/source4/lib/ldb/tests/python/sec_descriptor.py +++ b/source4/lib/ldb/tests/python/sec_descriptor.py @@ -11,7 +11,6 @@ import random import time sys.path.append("bin/python") -sys.path.append("../lib/subunit/python") import samba.getopt as options @@ -27,7 +26,7 @@ from samba.dcerpc import security from samba.auth import system_session from samba import Ldb, DS_DOMAIN_FUNCTION_2008, SECINFO_OWNER, \ SECINFO_GROUP, SECINFO_DACL, SECINFO_SACL -from subunit import SubunitTestRunner +from subunit.run import SubunitTestRunner import unittest parser = optparse.OptionParser("sec_descriptor [options] <host>") |