diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-11-03 17:53:19 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-11-03 17:47:54 +0000 |
| commit | 0baa1fb4e494afd11904a3f9b940f2ef265378a4 (patch) | |
| tree | c2a3daeb2bcf981fb363b4c2bfd4f7315bf07a44 /source4/dsdb/tests/python/ldap.py | |
| parent | 4f87f8f33e5df1d2236bb07e66eb0c5a9cee65b6 (diff) | |
| download | samba-0baa1fb4e494afd11904a3f9b940f2ef265378a4.tar.gz samba-0baa1fb4e494afd11904a3f9b940f2ef265378a4.tar.bz2 samba-0baa1fb4e494afd11904a3f9b940f2ef265378a4.zip | |
pydsdb: Import testtools before subunit for those that don't have
testtools installed.
Also, cleanup some imports.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Wed Nov 3 17:47:55 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4/dsdb/tests/python/ldap.py')
| -rwxr-xr-x | source4/dsdb/tests/python/ldap.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py index 36c12a2930..7057fb4e1e 100755 --- a/source4/dsdb/tests/python/ldap.py +++ b/source4/dsdb/tests/python/ldap.py @@ -10,8 +10,8 @@ import os sys.path.append("bin/python") import samba -samba.ensure_external_module("subunit", "subunit/python") samba.ensure_external_module("testtools", "testtools") +samba.ensure_external_module("subunit", "subunit/python") import samba.getopt as options @@ -23,19 +23,15 @@ from ldb import ERR_NOT_ALLOWED_ON_NON_LEAF, ERR_OTHER, ERR_INVALID_DN_SYNTAX from ldb import ERR_NO_SUCH_ATTRIBUTE, ERR_INVALID_ATTRIBUTE_SYNTAX from ldb import ERR_OBJECT_CLASS_VIOLATION, ERR_NOT_ALLOWED_ON_RDN from ldb import ERR_NAMING_VIOLATION, ERR_CONSTRAINT_VIOLATION -from ldb import ERR_UNDEFINED_ATTRIBUTE_TYPE from ldb import Message, MessageElement, Dn from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE from samba import Ldb -from samba.dsdb import (UF_NORMAL_ACCOUNT, UF_INTERDOMAIN_TRUST_ACCOUNT, - UF_WORKSTATION_TRUST_ACCOUNT, UF_SERVER_TRUST_ACCOUNT, - UF_PARTIAL_SECRETS_ACCOUNT, +from samba.dsdb import (UF_NORMAL_ACCOUNT, + UF_WORKSTATION_TRUST_ACCOUNT, UF_PASSWD_NOTREQD, UF_ACCOUNTDISABLE, ATYPE_NORMAL_ACCOUNT, ATYPE_WORKSTATION_TRUST, SYSTEM_FLAG_DOMAIN_DISALLOW_MOVE, SYSTEM_FLAG_CONFIG_ALLOW_RENAME, SYSTEM_FLAG_CONFIG_ALLOW_MOVE, SYSTEM_FLAG_CONFIG_ALLOW_LIMITED_MOVE) -from samba.dcerpc.security import (DOMAIN_RID_USERS, DOMAIN_RID_DOMAIN_MEMBERS, - DOMAIN_RID_DCS, DOMAIN_RID_READONLY_DCS) from subunit.run import SubunitTestRunner import unittest |