s4:dsdb:tests: Remove unused imports

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/tests/python/ad_dc_multi_bind.py b/source4/dsdb/tests/python/ad_dc_multi_bind.py
index 564fb9e0a85dcf6cc3890e7896b0edc43670f284..62ae9bcf47c565fed02bf860fda4ed15a2bba119 100644 (file)
--- a/source4/dsdb/tests/python/ad_dc_multi_bind.py
+++ b/source4/dsdb/tests/python/ad_dc_multi_bind.py
@@ -7,12 +7,6 @@ sys.path.insert(0, 'bin/python')
 import os
 import samba
 import samba.getopt as options
-import random
-import tempfile
-import shutil
-import time
-
-from samba.netcmd.main import cmd_sambatool
 
 # We try to use the test infrastructure of Samba 4.3+, but if it
 # doesn't work, we are probably in a back-ported patch and trying to
@@ -32,9 +26,7 @@ except ImportError:
 
 from samba.samdb import SamDB
 from samba.auth import system_session
-from ldb import Message, MessageElement, Dn, LdbError
-from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE
-from ldb import SCOPE_BASE, SCOPE_SUBTREE, SCOPE_ONELEVEL
+from ldb import SCOPE_BASE
 
 parser = optparse.OptionParser("ad_dc_multi_bind.py [options] <host>")
 sambaopts = options.SambaOptions(parser)

diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py
index 7375f26e895fb70d44ceb3162ab30930dd16fd0c..118e6b5b558d7396bf376c00496f280e8bce7770 100755 (executable)
--- a/source4/dsdb/tests/python/deletetest.py
+++ b/source4/dsdb/tests/python/deletetest.py
@@ -13,9 +13,9 @@ from samba.tests.subunitrun import SubunitOptions, TestProgram
 import samba.getopt as options
 
 from samba.auth import system_session
-from ldb import SCOPE_BASE, LdbError, Message, MessageElement, Dn, FLAG_MOD_ADD, FLAG_MOD_DELETE, FLAG_MOD_REPLACE
-from ldb import ERR_NO_SUCH_OBJECT, ERR_NOT_ALLOWED_ON_NON_LEAF, ERR_ENTRY_ALREADY_EXISTS, ERR_ATTRIBUTE_OR_VALUE_EXISTS
-from ldb import ERR_UNWILLING_TO_PERFORM, ERR_OPERATIONS_ERROR
+from ldb import SCOPE_BASE, LdbError
+from ldb import ERR_NO_SUCH_OBJECT, ERR_NOT_ALLOWED_ON_NON_LEAF
+from ldb import ERR_UNWILLING_TO_PERFORM
 from samba.samdb import SamDB
 from samba.tests import delete_force
 from samba import dsdb

diff --git a/source4/dsdb/tests/python/ndr_pack_performance.py b/source4/dsdb/tests/python/ndr_pack_performance.py
index 3b31a3a29a70cb51b5c41108924d4fc32cb72fb2..a608d1af1b8d9f1079a683d001ec8d06b4a87bea 100644 (file)
--- a/source4/dsdb/tests/python/ndr_pack_performance.py
+++ b/source4/dsdb/tests/python/ndr_pack_performance.py
@@ -8,13 +8,8 @@ import os
 import samba
 import samba.getopt as options
 import random
-import tempfile
-import shutil
-import time
 import gzip
 
-from samba.netcmd.main import cmd_sambatool
-
 # We try to use the test infrastructure of Samba 4.3+, but if it
 # doesn't work, we are probably in a back-ported patch and trying to
 # run on 4.1 or something.
@@ -31,9 +26,6 @@ except ImportError:
     from subunit.run import SubunitTestRunner
     import unittest
 
-from samba.samdb import SamDB
-from samba.auth import system_session
-
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.dcerpc import security
 from samba.dcerpc import drsuapi

diff --git a/source4/dsdb/tests/python/notification.py b/source4/dsdb/tests/python/notification.py
index a82b69afcfefe6b347ea4816b62defa16a45d4f0..1124af1b4b07e0f5e3f396204d9494c41f3dd1dd 100755 (executable)
--- a/source4/dsdb/tests/python/notification.py
+++ b/source4/dsdb/tests/python/notification.py
@@ -31,15 +31,10 @@ from samba.auth import system_session
 from samba import ldb
 from samba.samdb import SamDB
 from samba.ndr import ndr_unpack
-from samba import gensec
-from samba.credentials import Credentials
 import samba.tests
 
-from samba.auth import AUTH_SESSION_INFO_DEFAULT_GROUPS, AUTH_SESSION_INFO_AUTHENTICATED, AUTH_SESSION_INFO_SIMPLE_PRIVILEGES
-
-from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError
+from ldb import LdbError
 from ldb import ERR_TIME_LIMIT_EXCEEDED, ERR_ADMIN_LIMIT_EXCEEDED, ERR_UNWILLING_TO_PERFORM
-from ldb import Message
 
 parser = optparse.OptionParser("notification.py [options] <host>")
 sambaopts = options.SambaOptions(parser)

diff --git a/source4/dsdb/tests/python/priv_attrs.py b/source4/dsdb/tests/python/priv_attrs.py
index 0450cc561db22f9a69b95473388eebfa1906c3f9..74b3d1ef5309d3d71c7c84bb262da55e5e528ddb 100644 (file)
--- a/source4/dsdb/tests/python/priv_attrs.py
+++ b/source4/dsdb/tests/python/priv_attrs.py
@@ -15,31 +15,27 @@ import samba
 import samba.getopt as options
 import samba.tests
 import ldb
-import base64
 
 sys.path.insert(0, "bin/python")
-from samba.tests.subunitrun import TestProgram, SubunitOptions
 from samba.tests import DynamicTestCase
 from samba.subunit.run import SubunitTestRunner
-from samba.auth import system_session
 from samba.samdb import SamDB
-from samba.dcerpc import samr, security, lsa
+from samba.dcerpc import security
 from samba.credentials import Credentials
-from samba.ndr import ndr_unpack, ndr_pack
+from samba.ndr import ndr_pack
 from samba.tests import delete_force
 from samba import gensec, sd_utils
 from samba.credentials import DONT_USE_KERBEROS
-from ldb import SCOPE_SUBTREE, SCOPE_BASE, LdbError
-from ldb import Message, MessageElement, Dn
-from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE
-from samba.dsdb import UF_SCRIPT, UF_ACCOUNTDISABLE, UF_00000004, UF_HOMEDIR_REQUIRED, \
-    UF_LOCKOUT, UF_PASSWD_NOTREQD, UF_PASSWD_CANT_CHANGE, UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED,\
-    UF_TEMP_DUPLICATE_ACCOUNT, UF_NORMAL_ACCOUNT, UF_00000400, UF_INTERDOMAIN_TRUST_ACCOUNT, \
-    UF_WORKSTATION_TRUST_ACCOUNT, UF_SERVER_TRUST_ACCOUNT, UF_00004000, \
-    UF_00008000, UF_DONT_EXPIRE_PASSWD, UF_MNS_LOGON_ACCOUNT, UF_SMARTCARD_REQUIRED, \
-    UF_TRUSTED_FOR_DELEGATION, UF_NOT_DELEGATED, UF_USE_DES_KEY_ONLY, UF_DONT_REQUIRE_PREAUTH, \
-    UF_PASSWORD_EXPIRED, UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION, UF_NO_AUTH_DATA_REQUIRED, \
-    UF_PARTIAL_SECRETS_ACCOUNT, UF_USE_AES_KEYS
+from ldb import SCOPE_BASE, LdbError
+from samba.dsdb import (
+    UF_NORMAL_ACCOUNT,
+    UF_PARTIAL_SECRETS_ACCOUNT,
+    UF_PASSWD_NOTREQD,
+    UF_SERVER_TRUST_ACCOUNT,
+    UF_TRUSTED_FOR_DELEGATION,
+    UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION,
+    UF_WORKSTATION_TRUST_ACCOUNT,
+)
 
 
 parser = optparse.OptionParser("user_account_control.py [options] <host>")

diff --git a/source4/dsdb/tests/python/rodc.py b/source4/dsdb/tests/python/rodc.py
index 1a4b0f9b7ee1f79a68631ebe78fb35b01b26c5c4..b089a2707ff90f2c1409863e7d18048e26c92f90 100755 (executable)
--- a/source4/dsdb/tests/python/rodc.py
+++ b/source4/dsdb/tests/python/rodc.py
@@ -4,8 +4,6 @@
 import optparse
 import sys
 import os
-import base64
-import random
 import re
 import uuid
 
@@ -21,8 +19,6 @@ from samba.samdb import SamDB
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.dcerpc import drsblobs
 
-import time
-
 
 class RodcTestException(Exception):
     pass

diff --git a/source4/dsdb/tests/python/rodc_rwdc.py b/source4/dsdb/tests/python/rodc_rwdc.py
index 53d54807a3de0bf593f1cf1de346146116011475..b2e8c732ed03cd80de17142933c3d712c8bc76da 100644 (file)
--- a/source4/dsdb/tests/python/rodc_rwdc.py
+++ b/source4/dsdb/tests/python/rodc_rwdc.py
@@ -14,7 +14,6 @@ import itertools
 import time
 
 sys.path.insert(0, "bin/python")
-import samba
 import ldb
 
 from samba.tests.subunitrun import SubunitOptions, TestProgram
@@ -24,7 +23,7 @@ from samba.auth import system_session
 from samba.samdb import SamDB
 from samba.credentials import Credentials, DONT_USE_KERBEROS, MUST_USE_KERBEROS
 from samba import gensec, dsdb
-from ldb import SCOPE_BASE, LdbError, ERR_INVALID_CREDENTIALS
+from ldb import LdbError, ERR_INVALID_CREDENTIALS
 from samba.dcerpc import security, samr
 import os
 

diff --git a/source4/dsdb/tests/python/sort.py b/source4/dsdb/tests/python/sort.py
index a4d7b72f744822f58ddbf09d90afeb18f018ce8b..8c5ba4e552332e6e5bb80ceb62597ca24a41f080 100644 (file)
--- a/source4/dsdb/tests/python/sort.py
+++ b/source4/dsdb/tests/python/sort.py
@@ -12,7 +12,7 @@ import re
 
 sys.path.insert(0, "bin/python")
 import samba
-from samba.tests.subunitrun import SubunitOptions, TestProgram
+from samba.tests.subunitrun import SubunitOptions
 from samba.common import cmp
 from functools import cmp_to_key
 import samba.getopt as options

diff --git a/source4/dsdb/tests/python/subtree_rename.py b/source4/dsdb/tests/python/subtree_rename.py
index ad5a5b8820266babc5f2d07fa90025b94c4ec74a..2828fe5ee4b3f9d21049c113cf5501f959c485a9 100644 (file)
--- a/source4/dsdb/tests/python/subtree_rename.py
+++ b/source4/dsdb/tests/python/subtree_rename.py
@@ -4,7 +4,6 @@
 import optparse
 import sys
 import os
-import itertools
 from time import time
 from binascii import hexlify
 

diff --git a/source4/dsdb/tests/python/tombstone_reanimation.py b/source4/dsdb/tests/python/tombstone_reanimation.py
index 787ed999c4b469f022ada62eef40ab833d08bbb3..88aebd6a605aa67c5b16c9fa7914022bd03c9ec5 100755 (executable)
--- a/source4/dsdb/tests/python/tombstone_reanimation.py
+++ b/source4/dsdb/tests/python/tombstone_reanimation.py
@@ -26,7 +26,6 @@ import samba
 
 from samba.ndr import ndr_unpack, ndr_print
 from samba.dcerpc import misc
-from samba.dcerpc import security
 from samba.dcerpc import drsblobs
 from samba.dcerpc.drsuapi import *
 from samba.tests.password_test import PasswordCommon

diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py
index 04e61e9e791db7234a0807160a95f3482e1c255a..1506dcd37f8edb04340c39e1cf6ca930d2de60d8 100755 (executable)
--- a/source4/dsdb/tests/python/user_account_control.py
+++ b/source4/dsdb/tests/python/user_account_control.py
@@ -15,23 +15,19 @@ import samba
 import samba.getopt as options
 import samba.tests
 import ldb
-import base64
 
 sys.path.insert(0, "bin/python")
-from samba.tests.subunitrun import TestProgram, SubunitOptions
 
 from samba.subunit.run import SubunitTestRunner
 from samba.auth import system_session
 from samba.samdb import SamDB
-from samba.dcerpc import samr, security, lsa
+from samba.dcerpc import samr, security
 from samba.credentials import Credentials
 from samba.ndr import ndr_unpack, ndr_pack
 from samba.tests import delete_force, DynamicTestCase
 from samba import gensec, sd_utils
 from samba.credentials import DONT_USE_KERBEROS
 from ldb import SCOPE_SUBTREE, SCOPE_BASE, LdbError
-from ldb import Message, MessageElement, Dn
-from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE
 from samba.dsdb import UF_SCRIPT, UF_ACCOUNTDISABLE, UF_00000004, UF_HOMEDIR_REQUIRED, \
     UF_LOCKOUT, UF_PASSWD_NOTREQD, UF_PASSWD_CANT_CHANGE, UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED,\
     UF_TEMP_DUPLICATE_ACCOUNT, UF_NORMAL_ACCOUNT, UF_00000400, UF_INTERDOMAIN_TRUST_ACCOUNT, \