sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-23 06:50:21 +03:00
Code

PEP8: fix E303: too many blank lines (2)

Browse Source 
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Joe Guo 2018-07-30 18:21:11 +12:00 committed by Douglas Bagnall
parent 211c9a5f85
commit fd6b2086cb
89 changed files with 0 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/logon/ntlogon/ntlogon.py
View File

@ -328,7 +328,6 @@ def run():
print 'Unable to open configuration file: ' + configfile
sys.exit(1)
#
# open the output file
#

1
lib/ldb-samba/tests/match_rules.py
View File

@ -1135,7 +1135,6 @@ class MatchRuleConditionTests(samba.tests.TestCase):
super(MatchRuleConditionTests, self).tearDown()
self.ldb.delete(self.ou, controls=['tree_delete:0'])
def test_g1_members(self):
res1 = self.ldb.search(self.ou,
scope=SCOPE_SUBTREE,

7
lib/ldb/tests/python/api.py
View File

@ -707,7 +707,6 @@ class SearchTests(LdbBaseTest):
# Ensure the LDB is closed now, so we close the FD
del(self.l)
def setUp(self):
super(SearchTests, self).setUp()
self.testdir = tempdir()
@ -1042,7 +1041,6 @@ class SearchTests(LdbBaseTest):
self.assertEqual(enum, ldb.ERR_INAPPROPRIATE_MATCHING)
self.assertIn(estr, "ldb FULL SEARCH disabled")
def test_subtree_and_or(self):
"""Testing a search"""
@ -1161,7 +1159,6 @@ class SearchTests(LdbBaseTest):
self.assertEqual(enum, ldb.ERR_INAPPROPRIATE_MATCHING)
self.assertIn(estr, "ldb FULL SEARCH disabled")
def test_dn_filter_one(self):
"""Testing that a dn= filter succeeds
(or fails with disallowDNFilter
@ -2016,7 +2013,6 @@ class BadIndexTests(LdbBaseTest):
# https://bugzilla.samba.org/show_bug.cgi?id=13361
self.assertEquals(len(res), 4)
def tearDown(self):
super(BadIndexTests, self).tearDown()
@ -2756,10 +2752,8 @@ class LdbResultTests(LdbBaseTest):
found = True
self.assertTrue(found)
# Show that search results can't see into a transaction
def test_search_against_trans(self):
found11 = False
@ -2824,7 +2818,6 @@ class LdbResultTests(LdbBaseTest):
(got_pid, status) = os.waitpid(pid, 0)
self.assertEqual(got_pid, pid)
def test_search_iter_against_trans(self):
found = False
found11 = False

1
python/examples/dnsserver.py
View File

@ -75,7 +75,6 @@ if __name__ == "__main__":
addrecbuf,
None)
print("querying the NS record")
res = dns_conn.DnssrvEnumRecords2(0x00070000,
0,

15
python/samba/dbchecker.py
View File

@ -1232,7 +1232,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
is_deleted = 'isDeleted' in obj and obj['isDeleted'][0].upper() == 'TRUE'
target_is_deleted = 'isDeleted' in res[0] and res[0]['isDeleted'][0].upper() == 'TRUE'
if is_deleted and not obj.dn in self.deleted_objects_containers and linkID:
# A fully deleted object should not have any linked
# attributes. (MS-ADTS 3.1.1.5.5.1.1 Tombstone
@ -1406,10 +1405,8 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
attrname, syntax_oid)
diff_count += 1
return error_count
def get_originating_time(self, val, attid):
'''Read metadata properties and return the originating time for
a given attributeId.
@ -1449,7 +1446,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
return (set_att, list_attid, wrong_attids)
def fix_metadata(self, obj, attr):
'''re-write replPropertyMetaData elements for a single attribute for a
object. This is used to fix missing replPropertyMetaData elements'''
@ -1676,7 +1672,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
self.report("Fixed attribute '%s' of '%s'\n" % (sd_attr, dn))
self.samdb.set_session_info(self.system_session_info)
def has_replmetadata_zero_invocationid(self, dn, repl_meta_data):
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
str(repl_meta_data))
@ -1697,7 +1692,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
return found
def err_replmetadata_zero_invocationid(self, dn, attr, repl_meta_data):
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
str(repl_meta_data))
@ -1735,7 +1729,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
"Failed to fix attribute %s" % attr):
self.report("Fixed attribute '%s' of '%s'\n" % (attr, dn))
def err_replmetadata_unknown_attid(self, dn, attr, repl_meta_data):
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
str(repl_meta_data))
@ -1748,7 +1741,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
self.report('ERROR: attributeID 0X%0X is not known in our schema, not fixing %s on %s\n' % (o.attid, attr, dn))
return
def err_replmetadata_incorrect_attid(self, dn, attr, repl_meta_data, wrong_attids):
repl = ndr_unpack(drsblobs.replPropertyMetaDataBlob,
str(repl_meta_data))
@ -1844,7 +1836,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
"Failed to fix attribute %s" % attr):
self.report("Fixed attribute '%s' of '%s'\n" % (attr, dn))
def is_deleted_deleted_objects(self, obj):
faulty = False
if "description" not in obj:
@ -2041,7 +2032,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
# NCs
deleted_objects_dn = None
object_rdn_attr = None
object_rdn_val = None
name_val = None
@ -2385,11 +2375,9 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
self.samdb.transaction_commit()
elif not self.samdb.am_rodc():
self.report("No RID Set found for this server: %s, and we are not the RID Master (so can not self-allocate)" % dn)
# Check some details of our own RID Set
if dn == self.rid_set_dn:
res = self.samdb.search(base=self.rid_set_dn, scope=ldb.SCOPE_BASE,
@ -2465,7 +2453,6 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
else:
next_free_rid += 1
return error_count
################################################################
@ -2503,11 +2490,9 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
self.report("Changed dsServiceName to GUID form")
return error_count
###############################################
# re-index the database
def reindex_database(self):
'''re-index the whole database'''
m = ldb.Message()

5
python/samba/graph.py
View File

@ -135,10 +135,6 @@ def shorten_vertex_names(vertices, suffix=',...', aggressive=False):
return vmap, replacements
def compile_graph_key(key_items, nodes_above=[], elisions=None,
prefix='key_', width=2):
"""Generate a dot file snippet that acts as a legend for a graph.
@ -573,7 +569,6 @@ def distance_matrix(vertices, edges,
vertices = [vmap[x] for x in vertices]
edges = [(vmap[a], vmap[b]) for a, b in edges]
vlen = max(6, max(len(v) for v in vertices))
# first, the key for the columns

13
python/samba/join.py
View File

@ -104,7 +104,6 @@ class DCJoinContext(object):
(enum, estr) = e4.args
raise DCJoinException(estr)
ctx.base_dn = str(ctx.samdb.get_default_basedn())
ctx.root_dn = str(ctx.samdb.get_root_basedn())
ctx.schema_dn = str(ctx.samdb.get_schema_basedn())
@ -265,7 +264,6 @@ class DCJoinContext(object):
(ldb.binary_encode("dns-%s" % ctx.myname),
ldb.binary_encode("dns/%s" % ctx.dnshostname)))
def cleanup_old_join(ctx, force=False):
"""Remove any DNs from a previous join."""
# find the krbtgt link
@ -312,8 +310,6 @@ class DCJoinContext(object):
if ctx.dns_cname_dn:
ctx.del_noerror(ctx.dns_cname_dn)
def promote_possible(ctx):
"""confirm that the account is just a bare NT4 BDC or a member server, so can be safely promoted"""
if ctx.subdomain:
@ -332,7 +328,6 @@ class DCJoinContext(object):
ctx.promote_from_dn = res[0].dn
def find_dc(ctx, domain):
"""find a writeable DC for the given domain"""
try:
@ -346,7 +341,6 @@ class DCJoinContext(object):
ctx.site = ctx.cldap_ret.client_site
return ctx.cldap_ret.pdc_dns_name
def get_behavior_version(ctx):
res = ctx.samdb.search(base=ctx.base_dn, scope=ldb.SCOPE_BASE, attrs=["msDS-Behavior-Version"])
if "msDS-Behavior-Version" in res[0]:
@ -465,7 +459,6 @@ class DCJoinContext(object):
r.attid = ctx.tmp_samdb.get_attid_from_lDAPDisplayName(attrname)
r.value_ctr = 1
def DsAddEntry(ctx, recs):
'''add a record via the DRSUAPI DsAddEntry call'''
if ctx.drsuapi is None:
@ -1064,7 +1057,6 @@ class DCJoinContext(object):
dns_conn = dnsserver.dnsserver("ncacn_ip_tcp:%s[%s]" % (ctx.server, binding_options),
ctx.lp, ctx.creds)
name_found = True
sd_helper = samba.sd_utils.SDUtils(ctx.samdb)
@ -1148,7 +1140,6 @@ class DCJoinContext(object):
% (security.SECINFO_OWNER
| security.SECINFO_GROUP)])
# Add record
ctx.logger.info("Adding DNS CNAME record %s.%s for %s"
% (msdcs_cname, msdcs_zone, cname_target))
@ -1178,7 +1169,6 @@ class DCJoinContext(object):
ctx.logger.info("All other DNS records (like _ldap SRV records) " +
"will be created samba_dnsupdate on first startup")
def join_replicate_new_dns_records(ctx):
for nc in (ctx.domaindns_zone, ctx.forestdns_zone):
if nc in ctx.nc_list:
@ -1188,8 +1178,6 @@ class DCJoinContext(object):
replica_flags=ctx.replica_flags,
full_sync=False)
def join_finalise(ctx):
"""Finalise the join, mark us synchronised and setup secrets db."""
@ -1363,7 +1351,6 @@ class DCJoinContext(object):
}
ctx.local_samdb.add(rec)
def build_nc_lists(ctx):
# nc_list is the list of naming context (NC) for which we will
# replicate in and send a updateRef command to the partner DC

1
python/samba/ms_schema.py
View File

@ -213,7 +213,6 @@ def __write_ldif_one(entry):
for v in vl:
out.append("%s: %s" % (l[0], v))
return "\n".join(out)

1
python/samba/netcmd/dbcheck.py
View File

@ -101,7 +101,6 @@ class cmd_dbcheck(Command):
except:
raise CommandError("Failed to connect to DB at %s. If this is a really old sam.ldb (before alpha9), then try again with --force-modules" % H)
if H is None or not over_ldap:
samdb_schema = samdb
else:

1
python/samba/netcmd/delegation.py
View File

@ -158,7 +158,6 @@ class cmd_delegation_for_any_protocol(Command):
metavar="URL", dest="H"),
]
takes_args = ["accountname", "onoff"]
def run(self, accountname, onoff, H=None, credopts=None, sambaopts=None,

2
python/samba/netcmd/dns.py
View File

@ -403,8 +403,6 @@ def print_dnsrecords(outf, records):
print_dns_record(outf, dns_rec)
# Convert data into a dns record
def data_to_dns_record(record_type, data):
if record_type == dnsp.DNS_TYPE_A:

6
python/samba/netcmd/domain.py
View File

@ -600,7 +600,6 @@ class cmd_domain_dcpromo(Command):
if samba.is_ntvfs_fileserver_built():
takes_options.extend(common_ntvfs_options)
takes_args = ["domain", "role?"]
def run(self, domain, role=None, sambaopts=None, credopts=None,
@ -841,7 +840,6 @@ class cmd_domain_demote(Command):
nmsg["options"] = ldb.MessageElement(str(dsa_options), ldb.FLAG_MOD_REPLACE, "options")
samdb.modify(nmsg)
self.errf.write("Asking partner server %s to synchronize from us\n"
% server)
for part in (samdb.get_schema_basedn(),
@ -987,7 +985,6 @@ class cmd_domain_demote(Command):
remote_samdb.modify(msg)
raise CommandError("Error while renaming %s to %s" % (str(dc_dn), str(newdn)), e)
server_dsa_dn = samdb.get_serverName()
domain = remote_samdb.get_root_basedn()
@ -2863,7 +2860,6 @@ class cmd_domain_trust_delete(DomainTrustCommand):
raise CommandError("Failed to find trust for domain '%s'" % domain)
raise self.RemoteRuntimeError(self, error, "failed to locate remote server")
if remote_policy_access is not None:
try:
remote_server = self.setup_remote_server(credopts, domain)
@ -3955,7 +3951,6 @@ This command expunges tombstones from the database."""
% (removed_objects, removed_links))
class cmd_domain_trust(SuperCommand):
"""Domain and forest trust management."""
@ -4140,7 +4135,6 @@ class cmd_domain_schema_upgrade(Command):
return count
def _apply_update(self, samdb, update_file, base_dir):
"""Wrapper function for parsing an LDIF file and applying the updates"""

6
python/samba/netcmd/drs.py
View File

@ -67,7 +67,6 @@ def drs_errmsg(werr):
return "failed, result %u (%s)" % (ecode, estring)
def attr_default(msg, attrname, default):
'''get an attribute from a ldap msg with a default'''
if attrname in msg:
@ -75,7 +74,6 @@ def attr_default(msg, attrname, default):
return default
def drs_parse_ntds_dn(ntds_dn):
'''parse a NTDS DN returning a site and server'''
a = ntds_dn.split(',')
@ -249,7 +247,6 @@ class cmd_drs_showrepl(Command):
self.message(colour.c_GREEN("[ALL GOOD]"))
def summary_output(self):
return self.summary_output_handler("summary")
@ -552,7 +549,6 @@ class cmd_drs_replicate(Command):
source_dsa_guid = msg[0]['objectGUID'][0]
dsa_options = int(attr_default(msg, 'options', 0))
req_options = 0
if not (dsa_options & dsdb.DS_NTDSDSA_OPT_DISABLE_OUTBOUND_REPL):
req_options |= drsuapi.DRSUAPI_DRS_WRIT_REP
@ -577,7 +573,6 @@ class cmd_drs_replicate(Command):
self.message("Replicate from %s to %s was successful." % (SOURCE_DC, DEST_DC))
class cmd_drs_bind(Command):
"""Show DRS capabilities of a server."""
@ -675,7 +670,6 @@ class cmd_drs_bind(Command):
self.message("Forest GUID: %s" % info.info.config_dn_guid)
class cmd_drs_options(Command):
"""Query or change 'options' for NTDS Settings object of a Domain Controller."""

1
python/samba/netcmd/dsacl.py
View File

@ -43,7 +43,6 @@ from samba.netcmd import (
)
class cmd_dsacl_set(Command):
"""Modify access list on a directory object."""

1
python/samba/netcmd/fsmo.py
View File

@ -395,7 +395,6 @@ You must provide an Admin user and password."""),
self.outf.write("FSMO seize of '%s' role successful\n" % role)
return True
def run(self, force=None, H=None, role=None,
credopts=None, sambaopts=None, versionopts=None):

2
python/samba/netcmd/ntacl.py
View File

@ -38,7 +38,6 @@ from samba.netcmd import (
)
class cmd_ntacl_set(Command):
"""Set ACLs on a file."""
@ -155,7 +154,6 @@ class cmd_ntacl_get(Command):
elif use_s3fs:
use_ntvfs = False
s3conf = s3param.get_context()
s3conf.load(lp.configfile)
# ensure we are using the right samba_dsdb passdb backend, no matter what

1
python/samba/netcmd/rodc.py
View File

@ -80,7 +80,6 @@ class cmd_rodc_preload(Command):
raise NamingError("Failed to find account '%s'" % account)
return str(res[0]["dn"])
def run(self, *accounts, **kwargs):
sambaopts = kwargs.get("sambaopts")
credopts = kwargs.get("credopts")

1
python/samba/netcmd/spn.py
View File

@ -178,7 +178,6 @@ class cmd_spn_delete(Command):
else:
result = res[0]
msg = ldb.Message()
spns = result.get("servicePrincipalName")
tab = []

2
python/samba/netcmd/user.py
View File

@ -533,7 +533,6 @@ Example3 shows how to enable a user in the domain against a local LDAP server.
"""
synopsis = "%prog (<username>|--filter <filter>) [options]"
takes_optiongroups = {
"sambaopts": options.SambaOptions,
"versionopts": options.VersionOptions,
@ -1170,7 +1169,6 @@ class GetPasswordCommand(Command):
except IndexError:
return None
# get the value for a virtualCrypt attribute.
# look for an exact match on algorithm and rounds in supplemental creds
# if not found calculate using Primary:CLEARTEXT

2
python/samba/provision/__init__.py
View File

@ -883,7 +883,6 @@ def setup_samdb_partitions(samdb_path, logger, lp, session_info,
"BACKEND_STORE": backend_store_line
})
setup_add_ldif(samdb, setup_path("provision_init.ldif"), {
"BACKEND_TYPE": provision_backend.type,
"SERVER_ROLE": serverrole,
@ -1690,7 +1689,6 @@ def setsysvolacl(samdb, netlogon, sysvol, uid, gid, domainsid, dnsdomain,
if domain_info["dns_domain"].upper() != dnsdomain.upper():
raise ProvisioningError('Realm as seen by pdb_samba_dsdb [%s] does not match Realm as seen by the provision script [%s]!' % (domain_info["dns_domain"].upper(), dnsdomain.upper()))
try:
if use_ntvfs:
os.chown(sysvol, -1, gid)

1
python/samba/remove_dc.py
View File

@ -450,7 +450,6 @@ def remove_dc(samdb, logger, dc_name):
samdb.transaction_commit()
def offline_remove_dc_RemoveDsServer(samdb, ntds_dn):
samdb.start_transaction()

4
python/samba/samdb.py
View File

@ -941,7 +941,6 @@ schemaUpdateNow: 1
m["maxPwdAge"] = ldb.MessageElement(value, ldb.FLAG_MOD_REPLACE, "maxPwdAge")
self.modify(m)
def get_maxPwdAge(self):
res = self.search(self.domain_dn(), scope=ldb.SCOPE_BASE, attrs=["maxPwdAge"])
if len(res) == 0:
@ -951,8 +950,6 @@ schemaUpdateNow: 1
else:
return int(res[0]["maxPwdAge"][0])
def set_minPwdLength(self, value):
value = str(value).encode('utf8')
m = ldb.Message()
@ -1089,7 +1086,6 @@ schemaUpdateNow: 1
'''garbage_collect_tombstones(lp, samdb, [dn], current_time, tombstone_lifetime)
-> (num_objects_expunged, num_links_expunged)'''
if tombstone_lifetime is None:
return dsdb._dsdb_garbage_collect_tombstones(self, dn,
current_time)

2
python/samba/tests/__init__.py
View File

@ -135,8 +135,6 @@ class TestCase(unittest.TestCase):
c.set_kerberos_state(kerberos_state)
return c
# These functions didn't exist before Python2.7:
if sys.version_info < (2, 7):
import warnings

1
python/samba/tests/audit_log_dsdb.py
View File

@ -492,7 +492,6 @@ class AuditLogDsdbTests(AuditLogTestBase):
# is subject to a race between smbd and the s4 rpc_server code
# as to which will set the description as it is DCE/RPC over SMB
def test_modify(self):
dn = "cn=" + USER_NAME + ",cn=users," + self.base_dn

2
python/samba/tests/credentials.py
View File

@ -147,12 +147,10 @@ class CredentialsTests(samba.tests.TestCaseInTempDir):
response = self.creds.get_ntlm_response(flags=credentials.CLI_CRED_NTLM_AUTH,
challenge=binascii.a2b_hex(hex_challenge))
self.assertEqual(response["nt_response"], binascii.a2b_hex(hex_ntlm_response))
self.assertEqual(response["nt_session_key"], binascii.a2b_hex(hex_session_key))
self.assertEqual(response["flags"], credentials.CLI_CRED_NTLM_AUTH)
def test_get_nt_hash_string(self):
self.creds.set_password_will_be_nt_hash(True)
hex_nthash = "c2ae1fe6e648846352453e816f2aeb93"

2
python/samba/tests/dcerpc/dnsserver.py
View File

@ -126,7 +126,6 @@ class DnsserverTests(RpcInterfaceTestCase):
session_info=system_session(),
credentials=self.get_credentials())
self.custom_zone = "zone"
zone_create_info = dnsserver.DNS_RPC_ZONE_CREATE_INFO_LONGHORN()
zone_create_info.pszZoneName = self.custom_zone
@ -759,7 +758,6 @@ class DnsserverTests(RpcInterfaceTestCase):
request_filter)
self.assertEquals(0, zones.dwZoneCount)
def test_complexoperation2(self):
client_version = dnsserver.DNS_CLIENT_VERSION_LONGHORN
request_filter = (dnsserver.DNS_ZONE_REQUEST_FORWARD |

3
python/samba/tests/dcerpc/raw_protocol.py
View File

@ -4629,8 +4629,6 @@ class TestDCERPC_BIND(RawDCERPCTest):
return self._test_spnego_level_bind(auth_level=dcerpc.DCERPC_AUTH_LEVEL_PRIVACY,
g_auth_level=dcerpc.DCERPC_AUTH_LEVEL_PRIVACY)
def _test_spnego_signing_auth_level_request(self, auth_level):
ndr32 = base.transfer_syntax_ndr()
@ -4904,7 +4902,6 @@ class TestDCERPC_BIND(RawDCERPCTest):
def test_spnego_signing_integrity(self):
return self._test_spnego_signing_auth_level_request(dcerpc.DCERPC_AUTH_LEVEL_INTEGRITY)
def test_assoc_group_fail1(self):
abstract = samba.dcerpc.mgmt.abstract_syntax()
transfer = base.transfer_syntax_ndr()

1
python/samba/tests/dcerpc/string.py
View File

@ -97,7 +97,6 @@ class StringTests(samba.tests.TestCase):
self.assertEqual(info.dns_name2, "2.example.com")
del info
def test_string_delete(self):
gc.collect()
info = drsblobs.repsFromTo2OtherInfo()

2
python/samba/tests/dns_forwarder.py
View File

@ -159,7 +159,6 @@ class DNSTest(TestCase):
self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
def contact_real_server(host, port):
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)
s.connect((host, port))
@ -332,7 +331,6 @@ class TestDnsForwarding(DNSTest):
except socket.timeout:
self.fail("DNS server is too slow (timeout %s)" % timeout)
def test_single_forwarder_waiting_forever(self):
s = self.start_toy_server(dns_servers[0], 53, 'forwarder1')
s.send('timeout 10000', 0)

2
python/samba/tests/docs.py
View File

@ -148,7 +148,6 @@ class SmbDotConfTests(TestCase):
except:
self.fail("Unable to load parameters")
def tearDown(self):
super(SmbDotConfTests, self).tearDown()
os.unlink(self.smbconf)
@ -372,7 +371,6 @@ class SmbDotConfTests(TestCase):
doc_triple = "%s\n Expected: %s" % (param, value_to_use)
failset.add("%s\n Got: %s" % (doc_triple, value_found))
if len(failset) > 0:
self.fail(self._format_message(failset,
"Parameters that were unexpectedly not set:"))

1
python/samba/tests/dsdb.py
View File

@ -737,7 +737,6 @@ class DsdbFullScanTests(TestCase):
self.creds.guess(self.lp)
self.session = system_session()
def test_sam_ldb_open_no_full_scan(self):
try:
self.samdb = SamDB(session_info=self.session,

4
python/samba/tests/dsdb_lock.py
View File

@ -221,7 +221,6 @@ class DsdbLockTestCase(SamDBTestCase):
self.assertEqual(os.WEXITSTATUS(status), 0)
self.assertEqual(got_pid, pid)
def _test_full_db_lock1(self, backend_path):
(r1, w1) = os.pipe()
@ -233,7 +232,6 @@ class DsdbLockTestCase(SamDBTestCase):
backenddb = ldb.Ldb(backend_path)
backenddb.transaction_start()
backenddb.add({"dn": "@DSDB_LOCK_TEST"})
@ -278,7 +276,6 @@ class DsdbLockTestCase(SamDBTestCase):
backend_path = self.lp.private_path(backend_subpath)
self._test_full_db_lock1(backend_path)
def test_full_db_lock1_config(self):
basedn = self.samdb.get_config_basedn()
backend_filename = "%s.ldb" % basedn.get_casefold()
@ -287,7 +284,6 @@ class DsdbLockTestCase(SamDBTestCase):
backend_path = self.lp.private_path(backend_subpath)
self._test_full_db_lock1(backend_path)
def _test_full_db_lock2(self, backend_path):
(r1, w1) = os.pipe()
(r2, w2) = os.pipe()

3
python/samba/tests/dsdb_schema_attributes.py
View File

@ -112,7 +112,6 @@ systemOnly: FALSE
self.assertIn(attr_ldap_name, [str(x) for x in idx_res[0]["@IDXATTR"]])
def test_AddUnIndexedAttribute(self):
# create names for an attribute to add
(attr_name, attr_ldap_name, attr_dn) = self._make_obj_names("schemaAttributes-Attr-")
@ -136,7 +135,6 @@ systemOnly: FALSE
self.assertNotIn(attr_ldap_name, [str(x) for x in idx_res[0]["@IDXATTR"]])
def test_AddTwoIndexedAttributes(self):
# create names for an attribute to add
(attr_name, attr_ldap_name, attr_dn) = self._make_obj_names("schemaAttributes-Attr-")
@ -209,7 +207,6 @@ systemOnly: FALSE
self.assertEquals(len(res[0]), 0)
self.assertFalse("@TEST_EXTRA" in res[0])
def test_modify_at_indexlist(self):
m = {"dn": "@INDEXLIST",
"@TEST_EXTRA": ["1"]

1
python/samba/tests/gensec.py
View File

@ -149,7 +149,6 @@ class GensecTests(samba.tests.TestCase):
def test_update_ntlmssp_to_spnego(self):
self._test_update("GSS-SPNEGO", "ntlmssp")
def test_max_update_size(self):
"""Test GENSEC by doing an exchange with ourselves using GSSAPI against a KDC"""

1
python/samba/tests/gpo.py
View File

@ -55,7 +55,6 @@ class GPOTests(tests.TestCase):
self.assertEquals(gpos[i].ds_path, ds_paths[i],
'ds_path did not match expected %s' % gpos[i].ds_path)
def test_gpo_ads_does_not_segfault(self):
try:
ads = gpo.ADS_STRUCT(self.server, 42, self.creds)

3
python/samba/tests/join.py
View File

@ -82,9 +82,7 @@ class JoinTestCase(DNSTKeyTest):
super(JoinTestCase, self).tearDown()
def test_join_makes_records(self):
"create a query packet containing one query record via TCP"
p = self.make_name_packet(dns.DNS_OPCODE_QUERY)
questions = []
@ -117,7 +115,6 @@ class JoinTestCase(DNSTKeyTest):
self.assertEquals(response.answers[0].rdata, self.join_ctx.dnshostname)
self.assertEquals(response.answers[1].rr_type, dns.DNS_QTYPE_A)
def test_join_records_can_update(self):
dc_creds = Credentials()
dc_creds.guess(self.join_ctx.lp)

1
python/samba/tests/kcc/__init__.py
View File

@ -58,7 +58,6 @@ class KCCTests(samba.tests.TestCase):
self.creds.set_username(os.environ["USERNAME"])
self.creds.set_password(os.environ["PASSWORD"])
def test_list_dsas(self):
my_kcc = kcc.KCC(unix_now, False, False, False, False)
my_kcc.load_samdb("ldap://%s" % os.environ["SERVER"],

1
python/samba/tests/kcc/ldif_import_export.py
View File

@ -132,7 +132,6 @@ class LdifImportExportTests(samba.tests.TestCaseInTempDir):
self.assertEqual(dn, ldb.Dn(samdb, "CN=NTDS Settings," + dsa))
self.remove_files(dburl)
def test_samdb_to_ldif_file(self):
dburl = os.path.join(self.tempdir, "ldap")
dburl2 = os.path.join(self.tempdir, "ldap_roundtrip")

1
python/samba/tests/krb5_credentials.py
View File

@ -60,7 +60,6 @@ class PyKrb5CredentialsTests(TestCase):
self.create_machine_account()
def tearDown(self):
super(PyKrb5CredentialsTests, self).tearDown()
delete_force(self.ldb, self.machine_dn)

1
python/samba/tests/password_hash.py
View File

@ -114,7 +114,6 @@ class PassWordHashTests(TestCase):
self.netbios_domain = res[0]["nETBIOSName"][0]
self.dns_domain = self.ldb.domain_dns_name()
# Gets back the basedn
base_dn = self.ldb.domain_dn()

2
python/samba/tests/password_hash_fl2003.py
View File

@ -36,7 +36,6 @@ from samba.dcerpc import drsblobs
import binascii
class PassWordHashFl2003Tests(PassWordHashTests):
def setUp(self):
@ -138,7 +137,6 @@ class PassWordHashFl2003Tests(PassWordHashTests):
self.assertEquals(4, pos)
self.assertEquals("Primary:CLEARTEXT", ct_package.name)
# Check that the WDigest values are correct.
#
digests = ndr_unpack(drsblobs.package_PrimaryWDigestBlob,

1
python/samba/tests/password_hash_fl2008.py
View File

@ -40,7 +40,6 @@ class PassWordHashFl2008Tests(PassWordHashTests):
def setUp(self):
super(PassWordHashFl2008Tests, self).setUp()
def test_default_supplementalCredentials(self):
self.add_user()

1
python/samba/tests/password_hash_ldap.py
View File

@ -107,7 +107,6 @@ class PassWordHashLDAPTests(PassWordHashTests):
net_ctx.replicate_decrypt(drs, attr, 0)
sc_blob = attr.value_ctr.values[0].blob
sc = ndr_unpack(drsblobs.supplementalCredentialsBlob, sc_blob)
return sc

4
python/samba/tests/posixacl.py
View File

@ -455,7 +455,6 @@ class PosixAclMappingTests(TestCaseInTempDir):
#
def test_setntacl_sysvol_dir_check_getposixacl(self):
acl = provision.SYSVOL_ACL
domsid = passdb.get_global_sam_sid()
@ -550,7 +549,6 @@ class PosixAclMappingTests(TestCaseInTempDir):
# mask::rwx
# other::---
def test_setntacl_policies_dir_check_getposixacl(self):
acl = provision.POLICIES_ACL
domsid = passdb.get_global_sam_sid()
@ -657,8 +655,6 @@ class PosixAclMappingTests(TestCaseInTempDir):
# mask::rwx
# other::---
def test_setntacl_policies_check_getposixacl(self):
acl = provision.POLICIES_ACL

6
python/samba/tests/py_credentials.py
View File

@ -70,7 +70,6 @@ class PyCredentialsTests(TestCase):
self.create_machine_account()
self.create_user_account()
def tearDown(self):
super(PyCredentialsTests, self).tearDown()
delete_force(self.ldb, self.machine_dn)
@ -104,7 +103,6 @@ class PyCredentialsTests(TestCase):
(authenticator, subsequent) = self.get_authenticator(c)
self.do_NetrLogonGetDomainInfo(c, authenticator, subsequent)
def test_SamLogonEx(self):
c = self.get_netlogon_connection()
@ -211,12 +209,10 @@ class PyCredentialsTests(TestCase):
else:
raise
# Test Credentials.encrypt_netr_crypt_password
# By performing a NetrServerPasswordSet2
# And the logging on using the new password.
def test_encrypt_netr_password(self):
# Change the password
self.do_Netr_ServerPasswordSet2()
@ -225,11 +221,9 @@ class PyCredentialsTests(TestCase):
self.lp,
self.machine_creds)
# Change the current machine account password with a
# netr_ServerPasswordSet2 call.
def do_Netr_ServerPasswordSet2(self):
c = self.get_netlogon_connection()
(authenticator, subsequent) = self.get_authenticator(c)

1
python/samba/tests/samba_tool/base.py
View File

@ -68,7 +68,6 @@ class SambaToolCmdTest(samba.tests.BlackboxTestCase):
credentials=creds, lp=lp)
return samdb
def runcmd(self, name, *args):
"""run a single level command"""
cmd = cmd_sambatool.subcommands[name]

2
python/samba/tests/samba_tool/computer.py
View File

@ -83,7 +83,6 @@ class ComputerCmdTestCase(SambaToolCmdTest):
self.assertEquals("%s" % found.get("description"),
computer["description"])
def tearDown(self):
super(ComputerCmdTestCase, self).tearDown()
# clean up all the left over computers, just in case
@ -136,7 +135,6 @@ class ComputerCmdTestCase(SambaToolCmdTest):
self.assertCmdFail(result, "Succeeded to create existing computer")
self.assertIn("already exists", err)
# try to delete all the computers we just created
for computer in self.computers:
(result, out, err) = self.runsubcmd("computer", "delete", "%s" %

1
python/samba/tests/samba_tool/dnscmd.py
View File

@ -411,7 +411,6 @@ class DnsCmdTestCase(SambaToolCmdTest):
"is of type '%s' where '%s' was expected."
% (record1, record2, dnstype1, dnstype2))
def test_update_valid_type(self):
for dnstype in self.good_records:
for record in self.good_records[dnstype]:

2
python/samba/tests/samba_tool/group.py
View File

@ -62,7 +62,6 @@ class GroupCmdTestCase(SambaToolCmdTest):
if self._find_group(group["name"]):
self.runsubcmd("group", "delete", group["name"])
def test_newgroup(self):
"""This tests the "group add" and "group delete" commands"""
# try to add all the groups again, this should fail
@ -97,7 +96,6 @@ class GroupCmdTestCase(SambaToolCmdTest):
self.assertEquals("%s" % found.get("samaccountname"),
"%s" % group["name"])
def test_list(self):
(result, out, err) = self.runsubcmd("group", "list",
"-H", "ldap://%s" % os.environ["DC_SERVER"],

2
python/samba/tests/samba_tool/ntacl.py
View File

@ -28,7 +28,6 @@ import random
class NtACLCmdSysvolTestCase(SambaToolCmdTest):
"""Tests for samba-tool ntacl sysvol* subcommands"""
def test_ntvfs(self):
(result, out, err) = self.runsubcmd("ntacl", "sysvolreset",
"--use-ntvfs")
@ -76,7 +75,6 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest):
acl = "O:DAG:DUD:P(A;OICI;0x001f01ff;;;DA)(A;OICI;0x001f01ff;;;EA)(A;OICIIO;0x001f01ff;;;CO)(A;OICI;0x001f01ff;;;DA)(A;OICI;0x001f01ff;;;SY)(A;OICI;0x001200a9;;;AU)(A;OICI;0x001200a9;;;ED)S:AI(OU;CIIDSA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)(OU;CIIDSA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)"
def test_ntvfs(self):
path = os.environ['SELFTEST_PREFIX']
tempf = os.path.join(path, "pytests" + str(int(100000 * random.random())))

3
python/samba/tests/samba_tool/ou.py
View File

@ -66,7 +66,6 @@ class OUCmdTestCase(SambaToolCmdTest):
self.assertCmdSuccess(result, out, err,
"Failed to delete ou '%s'" % ou["name"])
def test_newou(self):
"""This tests the "ou create" and "ou delete" commands"""
# try to create all the ous again, this should fail
@ -225,7 +224,6 @@ class OUCmdTestCase(SambaToolCmdTest):
found = self.assertMatch(out, str(obj.dn),
"object '%s' not found" % obj.dn)
def test_list(self):
(result, out, err) = self.runsubcmd("ou", "list",
"--full-dn")
@ -244,7 +242,6 @@ class OUCmdTestCase(SambaToolCmdTest):
found = self.assertMatch(out, str(obj.dn),
"object '%s' not found" % obj.dn)
def _randomOU(self, base={}):
"""create an ou with random attribute values, you can specify base
attributes"""

1
python/samba/tests/samba_tool/rodc.py
View File

@ -63,7 +63,6 @@ class RodcCmdTestCase(SambaToolCmdTest):
(result, out, err) = self.runsubcmd("drs", "replicate", "--local", "unused",
os.environ["DC_SERVER"], self.base_dn)
def test_single_by_account_name(self):
(result, out, err) = self.runsubcmd("rodc", "preload", "sambatool1",
"--server", os.environ["DC_SERVER"])

6
python/samba/tests/samba_tool/user.py
View File

@ -58,7 +58,6 @@ class UserCmdTestCase(SambaToolCmdTest):
user["checkUserFn"](user)
def tearDown(self):
super(UserCmdTestCase, self).tearDown()
# clean up all the left over users, just in case
@ -66,7 +65,6 @@ class UserCmdTestCase(SambaToolCmdTest):
if self._find_user(user["name"]):
self.runsubcmd("user", "delete", user["name"])
def test_newuser(self):
# try to add all the users again, this should fail
for user in self.users:
@ -303,9 +301,6 @@ class UserCmdTestCase(SambaToolCmdTest):
self.assertEquals(err, "", "setpassword with forced change")
self.assertMatch(out, "Changed password OK", "setpassword with forced change")
def test_setexpiry(self):
for user in self.users:
twodays = time.time() + (2 * 24 * 60 * 60)
@ -344,7 +339,6 @@ class UserCmdTestCase(SambaToolCmdTest):
expires = nttime2unix(int("%s" % found.get("accountExpires")))
self.assertWithin(expires, twodays, 5, "Ensure account expires is within 5 seconds of the expected time")
def test_list(self):
(result, out, err) = self.runsubcmd("user", "list",
"-H", "ldap://%s" % os.environ["DC_SERVER"],

2
python/samba/tests/samba_tool/user_wdigest.py
View File

@ -272,13 +272,11 @@ class UserCmdWdigestTestCase(SambaToolCmdTest):
USER_PASS)
self._testWDigest(attribute, expected)
# Hash14 MD5(LOWER(sAMAccountName),
# UPPER(DNSDomainName),
# password)
#
def test_Wdigest14(self):
attribute = "virtualWDigest14"
expected = calc_digest(USER_NAME.lower(),

2
python/samba/tests/samdb_api.py
View File

@ -147,14 +147,12 @@ class SamDBApiTestCase(TestCaseInTempDir):
except IOError as e:
self.assertEquals(e.errno, errno.ENOENT)
# Open a SamDB with the don't create new DB flag cleared.
# The underlying database file does not exist.
#
# Should successful open the SamDB creating a new database file.
#
def test_create_db_new_file(self):
SamDB(url="tdb://" + self.tempdir + "/test.db", flags=0)
existing = open(self.tempdir + "/test.db", mode="rb")

1
python/samba/tests/security.py
View File

@ -92,7 +92,6 @@ class SecurityDescriptorTests(samba.tests.TestCase):
desc1 = security.descriptor.from_sddl(text, dom)
self.assertRaises(TypeError, desc1.as_sddl, text)
def test_as_sddl_no_domainsid(self):
dom = security.dom_sid("S-2-0-0")
text = "O:AOG:DAD:(A;;RPWPCCDCLCSWRCWDWOGA;;;S-1-0-0)"

1
python/samba/upgrade.py
View File

@ -809,7 +809,6 @@ Please fix this account before attempting to upgrade again
(username in pgids) and (pgids[username] is not None):
add_posix_attrs(samdb=result.samdb, sid=userdata[username].user_sid, name=username, nisdomain=domainname.lower(), xid_type="ID_TYPE_UID", home=homes[username], shell=shells[username], pgid=pgids[username], logger=logger)
logger.info("Adding users to groups")
# Start a new transaction (should speed this up a little, due to index churn)
result.samdb.transaction_start()

1
script/generate_param.py
View File

@ -254,7 +254,6 @@ def make_lib_proto(path_in, path_out):
else:
raise Exception(parameter['name'] + " has an invalid param type " + parameter['type'])
file_out.write(output_string)
finally:
file_out.close()

4
source3/torture/test_ntlm_auth.py
View File

@ -98,7 +98,6 @@ def parseCommandLine():
parser.add_option("--target-service", dest="target_service",\
help="Target service for kerberos")
parser.add_option("--server-username", dest="server_username",\
help="User name server uses for local auth. [default: foo]")
parser.add_option("--server-password", dest="server_password",\
@ -112,7 +111,6 @@ def parseCommandLine():
parser.add_option("--require-membership-of", dest="sid",\
help="Require that the user is a member of this group to authenticate.")
parser.add_option("-s", "--configfile", dest="config_file",\
help="Path to smb.conf file. [default:/etc/samba/smb.conf")
@ -243,7 +241,6 @@ def main():
if buf.count("AF ", 0, 3) != 1:
sys.exit(4)
elif opts.client_helper == "ntlmssp-client-1" and opts.server_helper == "gss-spnego":
# We're in the parent
writeLine(client_out, "YR")
@ -273,7 +270,6 @@ def main():
if buf.count("AF * ", 0, 5) != 1:
sys.exit(4)
elif opts.client_helper == "gss-spnego-client" and opts.server_helper == "gss-spnego":
# We're in the parent
writeLine(server_out, "YR")

1
source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
View File

@ -93,7 +93,6 @@ def possible_inferiors_search(db, oc):
return poss
# see [MS-ADTS] section 3.1.1.4.5.21
# and section 3.1.1.4.2 for this algorithm

2
source4/dsdb/tests/python/acl.py
View File

@ -518,7 +518,6 @@ url: www.samba.org"""
# This 'modify' operation should always throw ERR_INSUFFICIENT_ACCESS_RIGHTS
self.fail()
def test_modify_u4(self):
"""11 Grant WP to PRINCIPAL_SELF and test modify"""
ldif = """
@ -1571,7 +1570,6 @@ userPassword: thatsAcomplPASS2
else:
self.fail()
def test_change_password7(self):
"""Try a password change operation without any CARs given"""
# users have change password by default - remove for negative testing

3
source4/dsdb/tests/python/ad_dc_search_performance.py
View File

@ -190,8 +190,6 @@ class UserTests(samba.tests.TestCase):
maybe_not, maybe_not))
random.seed(1)
for (j, c1, c2, v1, v2,
o1, o2, n1, n2) in random.sample(all_permutations, 100):
expression = ''.join(['(', j,
@ -257,7 +255,6 @@ class UserTests(samba.tests.TestCase):
self._link_user_and_group(i, 0)
self.state.next_linked_user = e
test_00_01_adding_users_1000 = _test_add_many_users
test_00_10_complex_search_1k_users = _test_complex_search

2
source4/dsdb/tests/python/deletetest.py
View File

@ -491,7 +491,6 @@ class BasicTreeDeleteTests(BasicDeleteTests):
self.assertEqual(objDeleted7["parentGUID"][0],
objDeleted6["objectGUID"][0])
objDeleted1 = self.search_guid(self.guid1)
objDeleted2 = self.search_guid(self.guid2)
objDeleted3 = self.search_guid(self.guid3)
@ -557,7 +556,6 @@ class BasicTreeDeleteTests(BasicDeleteTests):
self.assertFalse("CN=Deleted Objects" in str(objDeleted7.dn))
if not "://" in host:
if os.path.isfile(host):
host = "tdb://%s" % host

4
source4/dsdb/tests/python/dirsync.py
View File

@ -373,7 +373,6 @@ class SimpleDirsyncTests(DirsyncBaseTests):
attrs=["objectGUID"],
controls=["dirsync:1:0:0"])
def test_dirsync_send_delta(self):
"""Check that dirsync return correct delta when sending the last cookie"""
res = self.ldb_admin.search(self.base_dn,
@ -541,8 +540,6 @@ class SimpleDirsyncTests(DirsyncBaseTests):
self.ldb_admin.deletegroup("testgroup")
self.assertEqual(len(res[0].get("member")), 0)
def test_dirsync_deleted_items(self):
"""Check that dirsync returnd deleted objects too"""
# Let's create an OU
@ -613,7 +610,6 @@ class ExtendedDirsyncTests(SimpleDirsyncTests):
self.ldb_admin.add_remove_group_members("Administrators", [self.dirsync_user],
add_members_operation=True)
res = self.ldb_admin.search(self.base_dn,
expression="(name=Administrators)",
controls=[control1])

1
source4/dsdb/tests/python/dsdb_schema_info.py
View File

@ -149,7 +149,6 @@ systemOnly: FALSE
self._checkSchemaInfo(schi_before, schi_after)
pass
def _make_class_ldif(self, class_name, class_dn, sub_oid):
ldif = """
dn: """ + class_dn + """

7
source4/dsdb/tests/python/ldap.py
View File

@ -770,7 +770,6 @@ class BasicTests(samba.tests.TestCase):
self.ldb.add({'objectclass': 'organizationalUnit',
'dn': ou})
managers = []
for x in range(3):
m = "cn=manager%d,%s" % (x, ou)
@ -826,7 +825,6 @@ class BasicTests(samba.tests.TestCase):
self.ldb.delete(ou, ['tree_delete:1'])
def test_multivalued_attributes(self):
"""Test multi-valued attributes"""
ou = 'OU=mvattr,%s' % (self.base_dn)
@ -898,7 +896,6 @@ class BasicTests(samba.tests.TestCase):
self.ldb.delete(ou, ['tree_delete:1'])
def test_attribute_ranges(self):
"""Test attribute ranges"""
# Too short (min. 1)
@ -1371,11 +1368,9 @@ class BasicTests(samba.tests.TestCase):
delete_force(self.ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
# this test needs to be disabled until we really understand
# what the rDN length constraints are
def DISABLED_test_largeRDN(self):
"""Testing large rDN (limit 64 characters)"""
rdn = "CN=a012345678901234567890123456789012345678901234567890123456789012"
@ -2095,7 +2090,6 @@ servicePrincipalName: host/ldaptest2computer29
self.assertEquals(len(res), 1, "Could not find (cn=ldaptest2computer)")
self.assertEquals(len(res[0]["servicePrincipalName;range=0-19"]), 20)
res = ldb.search(self.base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName;range=0-30"])
self.assertEquals(len(res), 1, "Could not find (cn=ldaptest2computer)")
self.assertEquals(len(res[0]["servicePrincipalName;range=0-*"]), 30)
@ -2108,7 +2102,6 @@ servicePrincipalName: host/ldaptest2computer29
self.assertEquals(len(res), 1, "Could not find (cn=ldaptest2computer)")
self.assertEquals(len(res[0]["servicePrincipalName;range=30-*"]), 0)
res = ldb.search(self.base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName;range=10-40"])
self.assertEquals(len(res), 1, "Could not find (cn=ldaptest2computer)")
self.assertEquals(len(res[0]["servicePrincipalName;range=10-*"]), 20)

16
source4/dsdb/tests/python/ldap_schema.py
View File

@ -19,7 +19,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
import optparse
import sys
@ -304,7 +303,6 @@ instanceType: 4
# Delete the object
delete_force(self.ldb, "ou=%s,%s" % (object_name, self.base_dn))
def test_duplicate_attributeID(self):
"""Testing creating a duplicate attribute"""
rand = str(random.randint(1, 100000))
@ -348,7 +346,6 @@ systemOnly: FALSE
(enum, estr) = e2.args
self.assertEquals(enum, ERR_UNWILLING_TO_PERFORM)
def test_duplicate_attributeID_governsID(self):
"""Testing creating a duplicate attribute and class"""
rand = str(random.randint(1, 100000))
@ -393,7 +390,6 @@ systemOnly: FALSE
(enum, estr) = e3.args
self.assertEquals(enum, ERR_UNWILLING_TO_PERFORM)
def test_duplicate_cn(self):
"""Testing creating a duplicate attribute"""
rand = str(random.randint(1, 100000))
@ -481,7 +477,6 @@ systemOnly: FALSE
(enum, estr) = e5.args
self.assertEquals(enum, ERR_UNWILLING_TO_PERFORM)
def test_duplicate_explicit_ldapdisplayname(self):
"""Testing creating a duplicate attribute ldapdisplayname"""
rand = str(random.randint(1, 100000))
@ -527,7 +522,6 @@ systemOnly: FALSE
(enum, estr) = e6.args
self.assertEquals(enum, ERR_UNWILLING_TO_PERFORM)
def test_duplicate_explicit_ldapdisplayname_with_class(self):
"""Testing creating a duplicate attribute ldapdisplayname between
and attribute and a class"""
@ -576,7 +570,6 @@ systemOnly: FALSE
(enum, estr) = e7.args
self.assertEquals(enum, ERR_UNWILLING_TO_PERFORM)
def test_duplicate_via_rename_ldapdisplayname(self):
"""Testing creating a duplicate attribute ldapdisplayname"""
rand = str(random.randint(1, 100000))
@ -631,7 +624,6 @@ ldapDisplayName: """ + attr_ldap_display_name + """
(enum, estr) = e8.args
self.assertEquals(enum, ERR_UNWILLING_TO_PERFORM)
def test_duplicate_via_rename_attributeID(self):
"""Testing creating a duplicate attributeID"""
rand = str(random.randint(1, 100000))
@ -754,7 +746,6 @@ ldapDisplayName: """ + attr_ldap_display_name + """2
"""
self.ldb.modify_ldif(ldif)
def test_change_attributeID(self):
"""Testing change the attributeID"""
rand = str(random.randint(1, 100000))
@ -792,7 +783,6 @@ attributeId: """ + attributeID + """.1
(enum, estr) = e11.args
self.assertEquals(enum, ERR_CONSTRAINT_VIOLATION)
def test_change_attributeID_same(self):
"""Testing change the attributeID to the same value"""
rand = str(random.randint(1, 100000))
@ -830,7 +820,6 @@ attributeId: """ + attributeID + """
(enum, estr) = e12.args
self.assertEquals(enum, ERR_CONSTRAINT_VIOLATION)
def test_generated_linkID(self):
"""
Test that we automatically generate a linkID if the
@ -1200,7 +1189,6 @@ systemOnly: FALSE
(enum, estr) = e22.args
self.assertEquals(enum, ERR_UNWILLING_TO_PERFORM)
def test_change_governsID(self):
"""Testing change the governsID"""
rand = str(random.randint(1, 100000))
@ -1239,7 +1227,6 @@ governsId: """ + governsID + """.1
(enum, estr) = e23.args
self.assertEquals(enum, ERR_CONSTRAINT_VIOLATION)
def test_change_governsID_same(self):
"""Testing change the governsID"""
rand = str(random.randint(1, 100000))
@ -1278,7 +1265,6 @@ governsId: """ + governsID + """.1
(enum, estr) = e24.args
self.assertEquals(enum, ERR_CONSTRAINT_VIOLATION)
def test_subClassOf(self):
""" Testing usage of custom child classSchema
"""
@ -1493,7 +1479,6 @@ systemOnly: FALSE
(num, _) = e28.args
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
def _make_class_ldif(self, class_dn, class_name, sub_oid):
ldif = """
dn: """ + class_dn + """
@ -1596,7 +1581,6 @@ systemOnly: FALSE
self.assertEquals(len(res), 1)
self.assertFalse("msDS-IntId" in res[0])
def test_verify_msDS_IntId(self):
"""Verify msDS-IntId exists only on attributes without FLAG_SCHEMA_BASE_OBJECT flag set"""
count = 0

1
source4/dsdb/tests/python/linked_attributes.py
View File

@ -492,7 +492,6 @@ class LATests(samba.tests.TestCase):
self.replace_linked_attribute, g2,
[u1, u2, u3, u2])
def test_la_links_replace2(self):
users = self.add_objects(12, 'user', 'u_replace2')
g1, = self.add_objects(1, 'group', 'g_replace2')

4
source4/dsdb/tests/python/password_lockout_base.py
View File

@ -56,7 +56,6 @@ class BasePasswordTestCase(PasswordTestCase):
msg="attr[%s]=%r on dn[%s]" %
(name, res[0][name], res[0].dn))
print("%s = '%s'" % (name, res[0][name][0]))
if mode == "present":
@ -189,7 +188,6 @@ class BasePasswordTestCase(PasswordTestCase):
self.assertEquals(uinfo21.last_logon, lastLogon)
self.assertEquals(uinfo21.logon_count, logonCount)
# check LDAP again and make sure the samr.QueryUserInfo
# doesn't have any impact.
res2 = self.ldb.search(dn, scope=SCOPE_BASE, attrs=attrs)
@ -392,7 +390,6 @@ lockoutThreshold: """ + str(lockoutThreshold) + """
print(firstLogon)
print(lastLogonTimestamp)
self.assertGreater(lastLogon, badPasswordTime)
self.assertGreaterEqual(lastLogon, lastLogonTimestamp)
@ -735,7 +732,6 @@ lockoutThreshold: """ + str(lockoutThreshold) + """
msg=("second logon, firstlogon was %s" %
firstLogon))
lastLogon = int(res[0]["lastLogon"][0])
time.sleep(1)

1
source4/dsdb/tests/python/rodc.py
View File

@ -222,7 +222,6 @@ class RodcTests(samba.tests.TestCase):
"%s (which does not exist)" % dn)
def main():
global HOST, CREDS, LP
parser = optparse.OptionParser("rodc.py [options] <host>")

3
source4/dsdb/tests/python/rodc_rwdc.py
View File

@ -105,7 +105,6 @@ def preload_rodc_user(user_dn):
set_auto_replication(RWDC, False)
def get_server_ref_from_samdb(samdb):
server_name = samdb.get_serverName()
res = samdb.search(server_name,
@ -1030,7 +1029,6 @@ class RodcRwdcTests(password_lockout_base.BasePasswordTestCase):
"Expected: %s Got: %s" %
(errno, code))
def zero_min_password_age(self):
min_pwd_age = int(self.rwdc_db.get_minPwdAge())
if min_pwd_age != 0:
@ -1145,7 +1143,6 @@ class RodcRwdcTests(password_lockout_base.BasePasswordTestCase):
# This SHOULD succeed.
self.try_ldap_logon(RODC, creds2)
def test_change_password_reveal_on_demand_ntlm(self):
CREDS.set_kerberos_state(DONT_USE_KERBEROS)
self._test_ldap_change_password_reveal_on_demand(ldb.ERR_INVALID_CREDENTIALS)

3
source4/dsdb/tests/python/sam.py
View File

@ -3588,7 +3588,6 @@ class SamTests(samba.tests.TestCase):
delete_force(self.ldb, "cn=ldaptestgroup,cn=users," + self.base_dn)
def test_fSMORoleOwner_attribute(self):
"""Test fSMORoleOwner attribute"""
print("Test fSMORoleOwner attribute")
@ -3681,8 +3680,6 @@ class SamTests(samba.tests.TestCase):
["CN=Domain Controllers", "CN=Users,"],
]
for pr_object in protected_list:
try:
self.ldb.delete(pr_object[0] + "," + pr_object[1] + self.base_dn)

1
source4/dsdb/tests/python/sites.py
View File

@ -635,5 +635,4 @@ class SimpleSubnetTests(SitesBaseTests):
self.fail()
TestProgram(module=__name__, opts=subunitopts)

3
source4/dsdb/tests/python/token_group.py
View File

@ -407,7 +407,6 @@ class DynamicTokenTest(samba.tests.TestCase):
print("difference : %s" % sidset1.difference(sidset2))
self.fail(msg="calculated groups don't match against user PAC tokenGroups")
def test_tokenGroups_manual(self):
# Manually run the tokenGroups algorithm from MS-ADTS 3.1.1.4.5.19 and MS-DRSR 4.1.8.3
# and compare the result
@ -466,7 +465,6 @@ class DynamicTokenTest(samba.tests.TestCase):
if len(tokenGroupsSet.difference(wSet)):
self.fail(msg="additional tokenGroups: %s" % tokenGroupsSet.difference(wSet))
def filtered_closure(self, wSet, filter_grouptype):
res = self.admin_ldb.search(base=self.base_dn, scope=ldb.SCOPE_SUBTREE,
expression="(|(objectclass=user)(objectclass=group))",
@ -514,7 +512,6 @@ class DynamicTokenTest(samba.tests.TestCase):
closure(uSet, wSet, aSet)
def test_tokenGroupsGlobalAndUniversal_manual(self):
# Manually run the tokenGroups algorithm from MS-ADTS 3.1.1.4.5.19 and MS-DRSR 4.1.8.3
# and compare the result

1
source4/dsdb/tests/python/urgent_replication.py
View File

@ -140,7 +140,6 @@ systemFlags: 33554432""", ["relax:0"])
res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn)
self.assertNotEquals(res["uSNHighest"], res["uSNUrgent"])
# urgent replication should be enabled when deleting
self.delete_force(self.ldb, "cn=test crossRef,CN=Partitions,CN=Configuration," + self.base_dn)
res = self.ldb.load_partition_usn("cn=Configuration," + self.base_dn)

9
source4/dsdb/tests/python/user_account_control.py
View File

@ -179,7 +179,6 @@ class UserAccountControlTests(samba.tests.TestCase):
# Now reconnect without domain admin rights
self.samdb = SamDB(url=ldaphost, credentials=self.unpriv_creds, lp=lp)
def tearDown(self):
super(UserAccountControlTests, self).tearDown()
for computername in self.computernames:
@ -334,7 +333,6 @@ class UserAccountControlTests(samba.tests.TestCase):
(enum, estr) = e11.args
self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
def test_admin_mod_uac(self):
computername = self.computernames[0]
self.add_computer_ldap(computername, samdb=self.admin_samdb)
@ -382,7 +380,6 @@ class UserAccountControlTests(samba.tests.TestCase):
self.assertEqual(int(res[0]["userAccountControl"][0]), UF_NORMAL_ACCOUNT | UF_ACCOUNTDISABLE)
def test_uac_bits_set(self):
user_sid = self.sd_utils.get_object_sid(self.unpriv_user_dn)
mod = "(OA;;CC;bf967a86-0de6-11d0-a285-00aa003049e2;;%s)" % str(user_sid)
@ -437,7 +434,6 @@ class UserAccountControlTests(samba.tests.TestCase):
else:
self.fail("Unable to set userAccountControl bit 0x%08X on %s: %s" % (bit, m.dn, estr))
def uac_bits_unrelated_modify_helper(self, account_type):
user_sid = self.sd_utils.get_object_sid(self.unpriv_user_dn)
mod = "(OA;;CC;bf967a86-0de6-11d0-a285-00aa003049e2;;%s)" % str(user_sid)
@ -660,7 +656,6 @@ class UserAccountControlTests(samba.tests.TestCase):
(enum, estr) = e13.args
self.assertEqual(enum, ldb.ERR_UNWILLING_TO_PERFORM)
def test_primarygroupID_priv_DC_modify(self):
computername = self.computernames[0]
@ -672,7 +667,6 @@ class UserAccountControlTests(samba.tests.TestCase):
scope=SCOPE_SUBTREE,
attrs=[""])
m = ldb.Message()
m.dn = ldb.Dn(self.admin_samdb, "<SID=%s-%d>" % (str(self.domain_sid),
security.DOMAIN_RID_USERS))
@ -706,7 +700,6 @@ class UserAccountControlTests(samba.tests.TestCase):
scope=SCOPE_SUBTREE,
attrs=[""])
m = ldb.Message()
m.dn = ldb.Dn(self.admin_samdb, "<SID=%s-%d>" % (str(self.domain_sid),
security.DOMAIN_RID_USERS))
@ -729,7 +722,6 @@ class UserAccountControlTests(samba.tests.TestCase):
(enum, estr) = e15.args
self.assertEqual(enum, ldb.ERR_UNWILLING_TO_PERFORM)
def test_primarygroupID_priv_user_modify(self):
computername = self.computernames[0]
@ -741,7 +733,6 @@ class UserAccountControlTests(samba.tests.TestCase):
scope=SCOPE_SUBTREE,
attrs=[""])
m = ldb.Message()
m.dn = ldb.Dn(self.admin_samdb, "<SID=%s-%d>" % (str(self.domain_sid),
security.DOMAIN_RID_ADMINS))

3
source4/dsdb/tests/python/vlv.py
View File

@ -880,8 +880,6 @@ class VLVTests(samba.tests.TestCase):
self.assertCorrectResults(results, expected_order,
offset, before, after)
def test_server_vlv_with_cookie_show_deleted(self):
"""What do we see with the show_deleted control?"""
attrs = ['objectGUID',
@ -929,7 +927,6 @@ class VLVTests(samba.tests.TestCase):
self.assertCorrectResults(results, expected_order,
offset, before, after)
def test_server_vlv_gte_with_cookie(self):
attrs = [x for x in self.users[0].keys() if x not in
('dn', 'objectclass')]

1
source4/selftest/tests.py
View File

@ -936,7 +936,6 @@ plantestsuite("samba.blackbox.rpcclient_samlogon_testdenied", "rodc:local", [os.
"testdenied", "$DC_PASSWORD", "ncacn_np:$SERVER", configuration])
plantestsuite("samba4.blackbox.provision-backend", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_provision-backend.sh"), '$PREFIX/provision'])
# Test renaming the DC

3
source4/torture/drs/python/drs_base.py
View File

@ -363,7 +363,6 @@ class DrsBaseTestCase(SambaToolCmdTest):
dn_ordered=dn_ordered)
return (ctr6.new_highwatermark, ctr6.uptodateness_vector)
def _get_ctr6_dn_list(self, ctr6):
"""
Returns the DNs contained in a DsGetNCChanges response.
@ -377,7 +376,6 @@ class DrsBaseTestCase(SambaToolCmdTest):
return dn_list
def _check_ctr6(self, ctr6, expected_dns=[], expected_links=[],
dn_ordered=True, links_ordered=True,
more_data=False, nc_object_count=0,
@ -493,7 +491,6 @@ class DrsBaseTestCase(SambaToolCmdTest):
return partial_attribute_set
class AbstractLink:
def __init__(self, attid, flags, identifier, targetGUID,
targetDN=""):

1
source4/torture/drs/python/fsmo.py
View File

@ -74,7 +74,6 @@ class DrsFsmoTestCase(drs_base.DrsBaseTestCase):
else:
self.assertTrue("This DC already has the '%s' FSMO role" % role in out)
def _wait_for_role_transfer(self, ldb_dc, role_dn, master):
"""Wait for role transfer for certain amount of time

3
source4/torture/drs/python/getnc_exop.py
View File

@ -691,7 +691,6 @@ class DrsReplicaPrefixMapTestCase(drs_base.DrsBaseTestCase):
(level, ctr) = drs.DsGetNCChanges(drs_handle, 8, req8)
pfm = ctr.mapping_ctr
req8 = self._exop_req8(dest_dsa=None,
invocation_id=dc_guid_1,
nc_dn_str=self.user,
@ -766,7 +765,6 @@ class DrsReplicaPrefixMapTestCase(drs_base.DrsBaseTestCase):
(level, ctr) = drs.DsGetNCChanges(drs_handle, 8, req8)
pfm = ctr.mapping_ctr
req8 = self._exop_req8(dest_dsa=None,
invocation_id=dc_guid_1,
nc_dn_str=self.user,
@ -840,7 +838,6 @@ class DrsReplicaPrefixMapTestCase(drs_base.DrsBaseTestCase):
(level, ctr) = drs.DsGetNCChanges(drs_handle, 8, req8)
pfm = ctr.mapping_ctr
req8 = self._exop_req8(dest_dsa=None,
invocation_id=dc_guid_1,
nc_dn_str=self.user,

2
source4/torture/drs/python/linked_attributes_drs.py
View File

@ -112,7 +112,6 @@ class LATests(drs_base.DrsBaseTestCase):
return links
def assert_forward_links(self, obj, expected, attr='member'):
results = self.attr_search(obj, expected, attr)
self.assertEqual(len(results), len(expected))
@ -145,7 +144,6 @@ class LATests(drs_base.DrsBaseTestCase):
new_dn = res[0].dn
self.assert_forward_links(new_dn, {})
def test_la_links_delete_link(self):
u1, u2 = self.add_objects(2, 'user', 'u_del_link')
g1, g2 = self.add_objects(2, 'group', 'g_del_link')

25
source4/torture/drs/python/repl_move.py
View File

@ -250,7 +250,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
return user_cur
def test_ReplicateMoveObject1(self):
"""Verifies how a moved container with a user inside is replicated between two DCs.
This test should verify that:
@ -453,7 +452,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
is_deleted=False,
expected_metadata=modified_metadata)
# trigger replication from DC1 to DC2, for cleanup
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True)
@ -530,7 +528,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
expected_metadata=deleted_modified_metadata_dc1)
self.assertFalse("description" in user_cur)
def test_ReplicateMoveObject2(self):
"""Verifies how a moved container with a user inside is not
replicated between two DCs as no replication is triggered
@ -713,7 +710,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
is_deleted=True,
expected_metadata=deleted_metadata_dc1)
def test_ReplicateMoveObject3(self):
"""Verifies how a moved container with a user inside is replicated between two DCs.
This test should verify that:
@ -770,7 +766,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
obj_orig=user_orig, is_deleted=False,
expected_metadata=initial_metadata)
new_dn = ldb.Dn(self.ldb_dc1, "CN=%s" % username)
new_dn.add_base(self.ou2_dn)
self.ldb_dc1.rename(user_dn, new_dn)
@ -895,7 +890,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
is_deleted=True,
expected_metadata=deleted_metadata_dc2)
def test_ReplicateMoveObject3b(self):
"""Verifies how a moved container with a user inside is replicated between two DCs.
This test should verify that:
@ -952,7 +946,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
obj_orig=user_orig, is_deleted=False,
expected_metadata=initial_metadata)
new_dn = ldb.Dn(self.ldb_dc1, "CN=%s" % username)
new_dn.add_base(self.ou2_dn)
self.ldb_dc1.rename(user_dn, new_dn)
@ -1077,7 +1070,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
is_deleted=True,
expected_metadata=deleted_metadata_dc2)
def test_ReplicateMoveObject4(self):
"""Verifies how a moved container with a user inside is replicated between two DCs.
This test should verify that:
@ -1355,7 +1347,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
(DRSUAPI_ATTID_objectCategory, self.dc1_guid, 2),
(DRSUAPI_ATTID_isRecycled, self.dc1_guid, 1)]
# check user info on DC1 - should be deleted user
user_cur = self._check_obj(sam_ldb=self.ldb_dc1, drs=self.drs_dc1,
obj_orig=user_moved_orig,
@ -1478,7 +1469,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
user_cur = self._check_obj(sam_ldb=self.ldb_dc1, obj_orig=user_moved_orig, is_deleted=True)
self.assertFalse("description" in user_cur)
def test_ReplicateMoveObject6(self):
"""Verifies how a moved container is replicated between two DCs.
This test should verify that:
@ -1544,7 +1534,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
ou_cur = self._check_obj(sam_ldb=self.ldb_dc2, obj_orig=ou_moved_orig, is_deleted=True)
self.assertFalse("description" in ou_cur)
def test_ReplicateMoveObject7(self):
"""Verifies how a moved container is replicated between two DCs.
This test should verify that:
@ -1610,7 +1599,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
ou_cur = self._check_obj(sam_ldb=self.ldb_dc2, obj_orig=ou_moved_orig, is_deleted=True)
self.assertFalse("description" in ou_cur)
def test_ReplicateMoveObject8(self):
"""Verifies how a moved container is replicated between two DCs.
This test should verify that:
@ -1676,7 +1664,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
ou_cur = self._check_obj(sam_ldb=self.ldb_dc2, obj_orig=ou_moved_orig, is_deleted=True)
self.assertFalse("description" in ou_cur)
def test_ReplicateMoveObject9(self):
"""Verifies how a moved container is replicated between two DCs.
This test should verify that:
@ -1743,7 +1730,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
ou_cur = self._check_obj(sam_ldb=self.ldb_dc2, obj_orig=ou_moved_orig, is_deleted=True)
self.assertFalse("description" in ou_cur)
def test_ReplicateMoveObject10(self):
"""Verifies how a moved container is replicated between two DCs.
This test should verify that:
@ -1792,7 +1778,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
ou_cur = self._check_obj(sam_ldb=self.ldb_dc1, obj_orig=ou_orig, is_deleted=True)
self.assertFalse("description" in ou_cur)
def test_ReplicateMoveObject11(self):
"""Verifies how a moved container is replicated between two DCs.
This test should verify that:
@ -1842,7 +1827,6 @@ class DrsMoveObjectTestCase(drs_base.DrsBaseTestCase):
self.assertFalse("description" in ou_cur)
class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase):
def setUp(self):
@ -1910,7 +1894,6 @@ class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase):
self.ou6["objectclass"] = "organizationalUnit"
self.ou6["ou"] = self.ou6_dn.get_component_value(0)
def tearDown(self):
self.ldb_dc1.delete(self.top_ou, ["tree_delete:1"])
self._enable_all_repl(self.dnsname_dc1)
@ -1953,7 +1936,6 @@ class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase):
return user_cur
def test_ReplicateMoveInTree1(self):
"""Verifies how an object is replicated between two DCs.
This test should verify that:
@ -2010,7 +1992,6 @@ class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase):
# trigger replication from DC1 to DC2, for cleanup
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True)
def test_ReplicateMoveInTree2(self):
"""Verifies how an object is replicated between two DCs.
This test should verify that:
@ -2106,7 +2087,6 @@ class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase):
user_cur = self._check_obj(sam_ldb=self.ldb_dc2, obj_orig=user_moved_orig, is_deleted=True)
self.assertFalse("description" in user_cur)
def test_ReplicateMoveInTree3(self):
"""Verifies how an object is replicated between two DCs.
This test should verify that:
@ -2192,7 +2172,6 @@ class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase):
# trigger replication from DC1 to DC2, for cleanup
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True)
def test_ReplicateMoveInTree3b(self):
"""Verifies how an object is replicated between two DCs.
This test should verify that:
@ -2298,7 +2277,6 @@ class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase):
# trigger replication from DC1 to DC2, for cleanup
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True)
def test_ReplicateMoveInTree4(self):
"""Verifies how an object is replicated between two DCs.
This test should verify that:
@ -2360,7 +2338,6 @@ class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase):
# trigger replication from DC1 to DC2, for cleanup
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True)
def test_ReplicateAddInOU(self):
"""Verifies how an object is replicated between two DCs.
This test should verify that:
@ -2407,7 +2384,6 @@ class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase):
# trigger replication from DC1 to DC2, for cleanup
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True)
def test_ReplicateAddInMovedOU(self):
"""Verifies how an object is replicated between two DCs.
This test should verify that:
@ -2464,7 +2440,6 @@ class DrsMoveBetweenTreeOfObjectTestCase(drs_base.DrsBaseTestCase):
# trigger replication from DC1 to DC2, for cleanup
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True)
def test_ReplicateAddInConflictOU_time(self):
"""Verifies how an object is replicated between two DCs, when created in an ambigious location
This test should verify that:

2
source4/torture/drs/python/repl_rodc.py
View File

@ -102,7 +102,6 @@ class DrsRodcTestCase(drs_base.DrsBaseTestCase):
self.rodc_pass = "password12#"
self.computer_dn = "CN=%s,OU=Domain Controllers,%s" % (self.rodc_name, self.base_dn)
self.rodc_ctx = DCJoinContext(server=self.ldb_dc1.host_dns_name(),
creds=self.get_credentials(),
lp=self.get_loadparm(), site=self.site,
@ -661,7 +660,6 @@ class DrsRodcTestCase(drs_base.DrsBaseTestCase):
else:
self.assertEquals(list_1[i].originating_change_time, list_2[i].originating_change_time)
def _create_rodc(self, ctx):
ctx.nc_list = [ctx.base_dn, ctx.config_dn, ctx.schema_dn]
ctx.full_nc_list = [ctx.base_dn, ctx.config_dn, ctx.schema_dn]

4
source4/torture/drs/python/replica_sync.py
View File

@ -439,7 +439,6 @@ objectClass: organizationalUnit
self._check_deleted(self.ldb_dc2, self.ou1)
self._check_deleted(self.ldb_dc2, self.ou2)
def test_ReplConflictsRenameRemoteWin_with_child(self):
"""Tests that objects created in conflict become conflict DNs"""
self._disable_inbound_repl(self.dnsname_dc1)
@ -493,7 +492,6 @@ objectClass: organizationalUnit
self._check_deleted(self.ldb_dc2, ou1_child)
self._check_deleted(self.ldb_dc2, ou2_child)
def test_ReplConflictsRenameLocalWin(self):
"""Tests that objects created in conflict become conflict DNs"""
self._disable_inbound_repl(self.dnsname_dc1)
@ -584,7 +582,6 @@ objectClass: organizationalUnit
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True, full_sync=False)
# Check all deleted on DC1
self._check_deleted(self.ldb_dc1, self.ou1)
self._check_deleted(self.ldb_dc1, self.ou2)
@ -676,7 +673,6 @@ objectClass: organizationalUnit
self._net_drs_replicate(DC=self.dnsname_dc2, fromDC=self.dnsname_dc1, forced=True, full_sync=False)
# Check all deleted on DC1
self._check_deleted(self.ldb_dc1, self.ou1)
self._check_deleted(self.ldb_dc1, self.ou2)

1
source4/torture/drs/python/replica_sync_rodc.py
View File

@ -80,7 +80,6 @@ objectClass: organizationalUnit
self.assertTrue(dodn in str(ou_cur["dn"]),
"OU %s is deleted but it is not located under %s!" % (name_cur, dodn))
def test_ReplConflictsRODC(self):
"""Tests that objects created in conflict become conflict DNs"""
# Replicate all objects to RODC beforehand

1
source4/torture/drs/python/ridalloc_exop.py
View File

@ -588,7 +588,6 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
self._test_force_demote(fsmo_owner['dns_name'], "RIDALLOCTEST6")
shutil.rmtree(targetdir, ignore_errors=True)
def test_rid_set_dbcheck_after_seize(self):
"""Perform a join against the RID manager and assert we have a RID Set.
We seize the RID master role, then using dbcheck, we assert that we can

1
wintest/test-s4-howto.py
View File

@ -350,7 +350,6 @@ RebootOnCompletion=No
t.wait_reboot()
def test_dcpromo_rodc(t, vm):
'''test the RODC dcpromo worked'''
t.info("Checking the w2k8 RODC join is OK")

12
wintest/wintest.py
View File

@ -183,7 +183,6 @@ class wintest():
else:
return subprocess.call(cmd, shell=shell, cwd=dir)
def run_child(self, cmd, dir="."):
'''create a child and return the Popen handle to it'''
cwd = os.getcwd()
@ -409,7 +408,6 @@ zone "%s" IN {
''' % (self.getvar('LCREALM'), self.getvar('INTERFACE_IP')),
mode='a')
# add forwarding for the windows domains
domains = self.get_domains()
@ -426,7 +424,6 @@ zone "%s" IN {
''' % (d, domains[d]),
mode='a')
self.write_file("etc/rndc.conf", '''
# Start of rndc.conf
key "rndc-key" {
@ -441,7 +438,6 @@ options {
};
''')
def stop_bind(self):
'''Stop our private BIND from listening and operating'''
self.rndc_cmd("stop", checkfail=False)
@ -449,7 +445,6 @@ options {
self.run_cmd("rm -rf var/named")
def start_bind(self):
'''restart the test environment version of bind'''
self.info("Restarting bind9")
@ -476,7 +471,6 @@ options {
self.info("restoring /etc/resolv.conf")
self.run_cmd("mv -f %s /etc/resolv.conf" % self.resolv_conf_backup)
def vm_poweroff(self, vmname, checkfail=True):
'''power off a VM'''
self.setvar('VMNAME', vmname)
@ -656,7 +650,6 @@ options {
child.expect([pexpect.EOF, pexpect.TIMEOUT], timeout=5)
return True
def resolve_ip(self, hostname, retries=60, delay=5):
'''resolve an IP given a hostname, assuming NBT'''
while retries > 0:
@ -673,7 +666,6 @@ options {
self.info("retrying (retries=%u delay=%u)" % (retries, delay))
raise RuntimeError("Failed to resolve IP of %s" % hostname)
def open_telnet(self, hostname, username, password, retries=60, delay=5, set_time=False, set_ip=False,
disable_firewall=True, run_tlntadmn=True, set_noexpire=False):
'''open a telnet connection to a windows server, return the pexpect child'''
@ -820,7 +812,6 @@ options {
ret.append(self.vars[v])
return ret
def run_dcpromo_as_first_dc(self, vm, func_level=None):
self.setwinvars(vm)
self.info("Configuring a windows VM ${WIN_VM} at the first DC in the domain using dcpromo")
@ -883,7 +874,6 @@ RebootOnCompletion=No
self.retry_cmd("host -t SRV _ldap._tcp.${WIN_REALM} ${WIN_IP}", ['has SRV record'], retries=60, delay=5)
def start_winvm(self, vm):
'''start a Windows VM'''
self.setwinvars(vm)
@ -915,7 +905,6 @@ RebootOnCompletion=No
child.expect("Registration of the DNS resource records for all adapters of this computer has been initiated. Any errors will be reported in the Event Viewer")
child.expect("C:")
def test_remote_smbclient(self, vm, username="${WIN_USER}", password="${WIN_PASS}", args=""):
'''test smbclient against remote server'''
self.setwinvars(vm)
@ -932,7 +921,6 @@ RebootOnCompletion=No
child.sendline("net use t: \\\\${HOSTNAME}.%s\\test" % realm)
child.expect("The command completed successfully")
def setup(self, testname, subdir):
'''setup for main tests, parsing command line'''
self.parser.add_option("--conf", type='string', default='', help='config file')