From 0baa1fb4e494afd11904a3f9b940f2ef265378a4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 3 Nov 2010 17:53:19 +0100 Subject: pydsdb: Import testtools before subunit for those that don't have testtools installed. Also, cleanup some imports. Autobuild-User: Jelmer Vernooij Autobuild-Date: Wed Nov 3 17:47:55 UTC 2010 on sn-devel-104 --- source4/dsdb/tests/python/acl.py | 2 +- source4/dsdb/tests/python/deletetest.py | 2 +- source4/dsdb/tests/python/dsdb_schema_info.py | 4 ---- source4/dsdb/tests/python/ldap.py | 10 +++------- source4/dsdb/tests/python/ldap_schema.py | 2 +- source4/dsdb/tests/python/passwords.py | 2 +- source4/dsdb/tests/python/sam.py | 25 ++++++++++--------------- source4/dsdb/tests/python/sec_descriptor.py | 2 +- source4/dsdb/tests/python/urgent_replication.py | 2 +- 9 files changed, 19 insertions(+), 32 deletions(-) (limited to 'source4/dsdb/tests') diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py index d4c55a44ac..5d6ce25248 100755 --- a/source4/dsdb/tests/python/acl.py +++ b/source4/dsdb/tests/python/acl.py @@ -9,8 +9,8 @@ import re 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 diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py index 59ebf99c70..8ed5281a4c 100755 --- a/source4/dsdb/tests/python/deletetest.py +++ b/source4/dsdb/tests/python/deletetest.py @@ -7,8 +7,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 diff --git a/source4/dsdb/tests/python/dsdb_schema_info.py b/source4/dsdb/tests/python/dsdb_schema_info.py index 9c4f7b1c43..dc82fe071c 100755 --- a/source4/dsdb/tests/python/dsdb_schema_info.py +++ b/source4/dsdb/tests/python/dsdb_schema_info.py @@ -28,16 +28,12 @@ import sys import time import random -import os sys.path.append("bin/python") import samba -samba.ensure_external_module("subunit", "subunit/python") samba.ensure_external_module("testtools", "testtools") -from samba.auth import system_session from ldb import SCOPE_BASE, LdbError -from samba.samdb import SamDB import samba.tests import samba.dcerpc.drsuapi 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 diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py index 171d6d1ec4..f99a8405cf 100755 --- a/source4/dsdb/tests/python/ldap_schema.py +++ b/source4/dsdb/tests/python/ldap_schema.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 diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py index 314d71b00f..8f58890d18 100755 --- a/source4/dsdb/tests/python/passwords.py +++ b/source4/dsdb/tests/python/passwords.py @@ -15,8 +15,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 diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py index 6d5b1a2d6a..039ddf1e1c 100755 --- a/source4/dsdb/tests/python/sam.py +++ b/source4/dsdb/tests/python/sam.py @@ -4,33 +4,30 @@ import optparse import sys -import time -import base64 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 from samba.auth import system_session -from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError +from ldb import SCOPE_BASE, LdbError from ldb import ERR_NO_SUCH_OBJECT, ERR_ATTRIBUTE_OR_VALUE_EXISTS from ldb import ERR_ENTRY_ALREADY_EXISTS, ERR_UNWILLING_TO_PERFORM -from ldb import ERR_NOT_ALLOWED_ON_NON_LEAF, ERR_OTHER, ERR_INVALID_DN_SYNTAX -from ldb import ERR_NO_SUCH_ATTRIBUTE -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, ERR_INSUFFICIENT_ACCESS_RIGHTS +from ldb import ERR_OTHER +from ldb import ERR_OBJECT_CLASS_VIOLATION +from ldb import 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, +from samba.dsdb import (UF_NORMAL_ACCOUNT, UF_WORKSTATION_TRUST_ACCOUNT, UF_SERVER_TRUST_ACCOUNT, UF_PARTIAL_SECRETS_ACCOUNT, UF_TEMP_DUPLICATE_ACCOUNT, - UF_PASSWD_NOTREQD, UF_ACCOUNTDISABLE, ATYPE_NORMAL_ACCOUNT, + UF_PASSWD_NOTREQD, ATYPE_NORMAL_ACCOUNT, GTYPE_SECURITY_BUILTIN_LOCAL_GROUP, GTYPE_SECURITY_DOMAIN_LOCAL_GROUP, GTYPE_SECURITY_GLOBAL_GROUP, GTYPE_SECURITY_UNIVERSAL_GROUP, GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP, GTYPE_DISTRIBUTION_GLOBAL_GROUP, @@ -38,16 +35,14 @@ from samba.dsdb import (UF_NORMAL_ACCOUNT, UF_INTERDOMAIN_TRUST_ACCOUNT, ATYPE_SECURITY_GLOBAL_GROUP, ATYPE_SECURITY_UNIVERSAL_GROUP, ATYPE_SECURITY_LOCAL_GROUP, ATYPE_DISTRIBUTION_GLOBAL_GROUP, ATYPE_DISTRIBUTION_UNIVERSAL_GROUP, ATYPE_DISTRIBUTION_LOCAL_GROUP, - ATYPE_WORKSTATION_TRUST, SYSTEM_FLAG_DOMAIN_DISALLOW_MOVE, - SYSTEM_FLAG_CONFIG_ALLOW_RENAME, SYSTEM_FLAG_CONFIG_ALLOW_MOVE, - SYSTEM_FLAG_CONFIG_ALLOW_LIMITED_MOVE) + ATYPE_WORKSTATION_TRUST) 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 -from samba.ndr import ndr_pack, ndr_unpack +from samba.ndr import ndr_unpack from samba.dcerpc import security parser = optparse.OptionParser("sam.py [options] ") diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py index 6748883474..55a67dde82 100755 --- a/source4/dsdb/tests/python/sec_descriptor.py +++ b/source4/dsdb/tests/python/sec_descriptor.py @@ -10,8 +10,8 @@ import random 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 diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py index 47d43dd397..af5cacaaa8 100755 --- a/source4/dsdb/tests/python/urgent_replication.py +++ b/source4/dsdb/tests/python/urgent_replication.py @@ -7,8 +7,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 -- cgit