mirror of
https://github.com/samba-team/samba.git
synced 2025-01-08 21:18:16 +03:00
selftest: rename env plugin_s4_dc to ad_dc
This is the environment that represents our supported production setup of an active directory domain controller. Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Michael Adam
Andrew Bartlett
parent
64738c3206
commit
902aa3c710
@ -199,7 +199,7 @@ class cmd_ntacl_sysvolreset(Command):
|
||||
|
||||
s4_passdb = passdb.PDB(s3conf.get("passdb backend"))
|
||||
|
||||
# These assertions correct for current plugin_s4_dc selftest
|
||||
# These assertions correct for current ad_dc selftest
|
||||
# configuration. When other environments have a broad range of
|
||||
# groups mapped via passdb, we can relax some of these checks
|
||||
(LA_uid,LA_type) = s4_passdb.sid_to_id(LA_sid)
|
||||
|
||||
@ -330,7 +330,7 @@ class PosixAclMappingTests(TestCaseInTempDir):
|
||||
|
||||
s4_passdb = passdb.PDB(self.lp.get("passdb backend"))
|
||||
|
||||
# These assertions correct for current plugin_s4_dc selftest
|
||||
# These assertions correct for current ad_dc selftest
|
||||
# configuration. When other environments have a broad range of
|
||||
# groups mapped via passdb, we can relax some of these checks
|
||||
(LA_uid,LA_type) = s4_passdb.sid_to_id(LA_sid)
|
||||
@ -470,7 +470,7 @@ class PosixAclMappingTests(TestCaseInTempDir):
|
||||
|
||||
s4_passdb = passdb.PDB(self.lp.get("passdb backend"))
|
||||
|
||||
# These assertions correct for current plugin_s4_dc selftest
|
||||
# These assertions correct for current ad_dc selftest
|
||||
# configuration. When other environments have a broad range of
|
||||
# groups mapped via passdb, we can relax some of these checks
|
||||
(LA_uid,LA_type) = s4_passdb.sid_to_id(LA_sid)
|
||||
@ -564,7 +564,7 @@ class PosixAclMappingTests(TestCaseInTempDir):
|
||||
|
||||
s4_passdb = passdb.PDB(self.lp.get("passdb backend"))
|
||||
|
||||
# These assertions correct for current plugin_s4_dc selftest
|
||||
# These assertions correct for current ad_dc selftest
|
||||
# configuration. When other environments have a broad range of
|
||||
# groups mapped via passdb, we can relax some of these checks
|
||||
(LA_uid,LA_type) = s4_passdb.sid_to_id(LA_sid)
|
||||
@ -677,7 +677,7 @@ class PosixAclMappingTests(TestCaseInTempDir):
|
||||
|
||||
s4_passdb = passdb.PDB(self.lp.get("passdb backend"))
|
||||
|
||||
# These assertions correct for current plugin_s4_dc selftest
|
||||
# These assertions correct for current ad_dc selftest
|
||||
# configuration. When other environments have a broad range of
|
||||
# groups mapped via passdb, we can relax some of these checks
|
||||
(LA_uid,LA_type) = s4_passdb.sid_to_id(LA_sid)
|
||||
|
||||
@ -19,9 +19,9 @@
|
||||
^samba3.rpc.spoolss.printer.addprinterex.print_job_enum # fails on some hosts due to bug 10930
|
||||
^samba3.rpc.lsa.privileges.lsa.Privileges\(s3dc\) # fails sometimes on sn-devel
|
||||
^samba4.blackbox.gentest # is flakey due to timing
|
||||
^samba3.smb2.acls.INHERITANCE\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.smb2.acls.DYNAMIC\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.raw.acls.dynamic\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.raw.acls.inheritance\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.raw.samba3checkfsp.samba3checkfsp\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.raw.samba3closeerr.samba3closeerr\(plugin_s4_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.smb2.acls.INHERITANCE\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.smb2.acls.DYNAMIC\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.raw.acls.dynamic\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.raw.acls.inheritance\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.raw.samba3checkfsp.samba3checkfsp\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
^samba3.raw.samba3closeerr.samba3closeerr\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
^samba3.smb2.rename.*.simple_nodelete
|
||||
^samba3.smb2.rename.*.no_share_delete_no_delete_access
|
||||
^samba3.blackbox.smbclient_machine_auth.plain \(s3dc:local\)# the S3dc does not currently set up a self-join
|
||||
^samba3.raw.samba3hide.samba3hide\((s3dc|plugin_s4_dc)\) # This test fails against an smbd environment with NT ACLs enabled
|
||||
^samba3.raw.samba3hide.samba3hide\((s3dc|ad_dc)\) # This test fails against an smbd environment with NT ACLs enabled
|
||||
^samba3.raw.samba3closeerr.samba3closeerr\(s3dc\) # This test fails against an smbd environment with NT ACLs enabled
|
||||
^samba3.raw.acls nfs4acl_xattr-simple.INHERITFLAGS\(s3dc\) # This (and the follow nfs4acl_xattr tests fail because our NFSv4 backend isn't a complete mapping yet.
|
||||
^samba3.raw.acls nfs4acl_xattr-simple.sd\(s3dc\)
|
||||
@ -54,7 +54,7 @@
|
||||
^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_group\(s3dc\)
|
||||
^samba3.base.delete.deltest16a
|
||||
^samba3.base.delete.deltest17a
|
||||
^samba3.unix.whoami anonymous connection.whoami\(plugin_s4_dc\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token
|
||||
^samba3.unix.whoami anonymous connection.whoami\(ad_dc\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token
|
||||
^samba3.unix.whoami anonymous connection.whoami\(s3member\) # smbd maps anonymous logins to domain guest in the local domain, not SID_NT_ANONYMOUS
|
||||
# these show that we still have some differences between our system
|
||||
# with our internal iconv because it passes except when we bypass our
|
||||
@ -218,31 +218,31 @@
|
||||
^samba3.rpc.spoolss.printer.*.publish_toggle\(.*\)$ # needs spoolss AD member env
|
||||
^samba3.rpc.spoolss.printserver.*.add_processor\(.*\)$
|
||||
#
|
||||
# The following tests fail against plugin_s4_dc (aka s3fs) currently.
|
||||
# The following tests fail against ad_dc (aka s3fs) currently.
|
||||
# These need to be examined and either fixed or correctly categorised.
|
||||
# but in the interests of ensuring we do not regress, we run the tests
|
||||
# and list the current failures here.
|
||||
#
|
||||
^samba3.rpc.eventlog.eventlog.GetLogIntormation\(plugin_s4_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.FlushEventLog\(plugin_s4_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.ReportEventLog\(plugin_s4_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.ReadEventLog\(plugin_s4_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.GetNumRecords\(plugin_s4_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.OpenEventLog\(plugin_s4_dc\)
|
||||
^samba3.rap.basic.netsessiongetinfo\(plugin_s4_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.GetLogIntormation\(ad_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.FlushEventLog\(ad_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.ReportEventLog\(ad_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.ReadEventLog\(ad_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.GetNumRecords\(ad_dc\)
|
||||
^samba3.rpc.eventlog.eventlog.OpenEventLog\(ad_dc\)
|
||||
^samba3.rap.basic.netsessiongetinfo\(ad_dc\)
|
||||
#
|
||||
# The Samba4 netlogon server does not implement these LogonControl operations
|
||||
#
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(plugin_s4_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl\(plugin_s4_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(plugin_s4_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl\(plugin_s4_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(plugin_s4_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl\(plugin_s4_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(ad_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl\(ad_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(ad_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl\(ad_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(ad_dc\)
|
||||
^samba3.rpc.netlogon.admin.netlogon.LogonControl\(ad_dc\)
|
||||
#
|
||||
# The Samba4 winbind does not cover the full winbind protocol, so these are expected
|
||||
#
|
||||
^samba4.winbind.struct.show_sequence\(plugin_s4_dc\)
|
||||
^samba4.winbind.struct.show_sequence\(ad_dc\)
|
||||
^samba.blackbox.wbinfo\(dc:local\).wbinfo -N against dc
|
||||
^samba.blackbox.wbinfo\(dc:local\).wbinfo -I against dc
|
||||
^samba.blackbox.wbinfo\(dc:local\).wbinfo --trusted-domains against dc
|
||||
@ -259,8 +259,8 @@
|
||||
^samba.wbinfo_simple.\(dc:local\).--allocate-gid
|
||||
^samba.wbinfo_simple.\(s4member:local\).--allocate-uid
|
||||
^samba.wbinfo_simple.\(s4member:local\).--allocate-gid
|
||||
^samba.wbinfo_simple.\(plugin_s4_dc:local\).--allocate-uid
|
||||
^samba.wbinfo_simple.\(plugin_s4_dc:local\).--allocate-gid
|
||||
^samba.wbinfo_simple.\(ad_dc:local\).--allocate-uid
|
||||
^samba.wbinfo_simple.\(ad_dc:local\).--allocate-gid
|
||||
#
|
||||
# These do not work against winbindd in member mode for unknown reasons
|
||||
#
|
||||
@ -269,7 +269,7 @@
|
||||
^samba4.winbind.struct.lookup_name_sid\(s4member:local\)
|
||||
^samba.blackbox.wbinfo\(s4member:local\).wbinfo -r against s4member\(s4member:local\)
|
||||
^samba.blackbox.wbinfo\(s4member:local\).wbinfo --user-sids against s4member\(s4member:local\)
|
||||
^samba4.winbind.struct.getpwent\(plugin_s4_dc:local\)
|
||||
^samba4.winbind.struct.getpwent\(ad_dc:local\)
|
||||
^samba.wbinfo_simple.\(s4member:local\).--user-groups
|
||||
^samba.nss.test using winbind\(s4member:local\)
|
||||
#
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
^samba3.smb2.durable-open-disconnect # Not a test, but a way to create a disconnected durable
|
||||
^samba3.smb2.scan # No tests
|
||||
^samba3.smb2.oplock.levelii501 # No test yet
|
||||
^samba3.rpc.samr.passwords.lockout\(plugin_s4_dc\) # No point running this version, it just waits 12 times longer the samba4 version of this test, covering the same code
|
||||
^samba3.rpc.samr.passwords.lockout\(ad_dc\) # No point running this version, it just waits 12 times longer the samba4 version of this test, covering the same code
|
||||
^samba4.base.iometer
|
||||
^samba4.base.casetable
|
||||
^samba4.base.nttrans
|
||||
|
||||
@ -177,7 +177,7 @@ sub get_interface($)
|
||||
$interfaces{"dc7"} = 27;
|
||||
$interfaces{"rodc"} = 28;
|
||||
$interfaces{"localadmember"} = 29;
|
||||
$interfaces{"plugindc"} = 30;
|
||||
$interfaces{"addc"} = 30;
|
||||
$interfaces{"localsubdc"} = 31;
|
||||
$interfaces{"chgdcpass"} = 32;
|
||||
$interfaces{"promotedvdc"} = 33;
|
||||
|
||||
@ -1680,7 +1680,7 @@ sub provision_rodc($$$)
|
||||
return $ret;
|
||||
}
|
||||
|
||||
sub provision_plugin_s4_dc($$)
|
||||
sub provision_ad_dc($$)
|
||||
{
|
||||
my ($self, $prefix) = @_;
|
||||
|
||||
@ -1770,12 +1770,12 @@ sub provision_plugin_s4_dc($$)
|
||||
copy = print1
|
||||
";
|
||||
|
||||
print "PROVISIONING PLUGIN S4 DC...";
|
||||
print "PROVISIONING AD DC...";
|
||||
my $ret = $self->provision($prefix,
|
||||
"domain controller",
|
||||
"plugindc",
|
||||
"PLUGINDOMAIN",
|
||||
"plugindc.samba.example.com",
|
||||
"addc",
|
||||
"ADDOMAIN",
|
||||
"addc.samba.example.com",
|
||||
"2008",
|
||||
"locDCpass1",
|
||||
undef,
|
||||
@ -1974,10 +1974,10 @@ sub setup_env($$$)
|
||||
$self->setup_dc("$path/dc");
|
||||
}
|
||||
return $target3->setup_admember("$path/s3member", $self->{vars}->{dc}, 29);
|
||||
} elsif ($envname eq "plugin_s4_dc") {
|
||||
return $self->setup_plugin_s4_dc("$path/plugin_s4_dc");
|
||||
} elsif ($envname eq "plugin_s4_dc_no_nss") {
|
||||
return $self->setup_plugin_s4_dc("$path/plugin_s4_dc_no_nss", "no_nss");
|
||||
} elsif ($envname eq "ad_dc") {
|
||||
return $self->setup_ad_dc("$path/ad_dc");
|
||||
} elsif ($envname eq "ad_dc_no_nss") {
|
||||
return $self->setup_ad_dc("$path/ad_dc_no_nss", "no_nss");
|
||||
} elsif ($envname eq "s3member_rfc2307") {
|
||||
if (not defined($self->{vars}->{dc})) {
|
||||
$self->setup_dc("$path/dc");
|
||||
@ -2288,7 +2288,7 @@ sub setup_rodc($$$)
|
||||
return $env;
|
||||
}
|
||||
|
||||
sub setup_plugin_s4_dc($$)
|
||||
sub setup_ad_dc($$)
|
||||
{
|
||||
my ($self, $path, $no_nss) = @_;
|
||||
|
||||
@ -2297,7 +2297,7 @@ sub setup_plugin_s4_dc($$)
|
||||
return "UNKNOWN";
|
||||
}
|
||||
|
||||
my $env = $self->provision_plugin_s4_dc($path);
|
||||
my $env = $self->provision_ad_dc($path);
|
||||
unless ($env) {
|
||||
return undef;
|
||||
}
|
||||
@ -2311,7 +2311,7 @@ sub setup_plugin_s4_dc($$)
|
||||
|
||||
$self->wait_for_start($env);
|
||||
|
||||
$self->{vars}->{plugin_s4_dc} = $env;
|
||||
$self->{vars}->{ad_dc} = $env;
|
||||
return $env;
|
||||
}
|
||||
|
||||
|
||||
@ -144,7 +144,7 @@ def get_interface(netbiosname):
|
||||
"dc7": 27,
|
||||
"rodc": 28,
|
||||
"localadmember": 29,
|
||||
"plugindc": 30,
|
||||
"addc": 30,
|
||||
"localsubdc": 31,
|
||||
"chgdcpass": 32,
|
||||
}
|
||||
|
||||
@ -300,10 +300,10 @@ tests= base + raw + smb2 + rpc + unix + local + rap + nbt + libsmbclient + idmap
|
||||
|
||||
for t in tests:
|
||||
if t == "base.delaywrite":
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD -k yes --maximum-runtime=900')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD -k yes --maximum-runtime=900')
|
||||
elif t == "rap.sam":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')
|
||||
elif t == "winbind.pac":
|
||||
plansmbtorture4testsuite(t, "s3member:local", '//$SERVER/tmp --realm=$REALM --machine-pass --option=torture:addc=$DC_SERVER', description="machine account")
|
||||
elif t == "unix.whoami":
|
||||
@ -312,78 +312,78 @@ for t in tests:
|
||||
for env in ["s3dc", "member"]:
|
||||
plansmbtorture4testsuite(t, env, '//$SERVER/tmp -U$DC_USERNAME%$DC_PASSWORD')
|
||||
plansmbtorture4testsuite(t, env, '//$SERVER/tmpguest -U%', description='anonymous connection')
|
||||
for env in ["plugin_s4_dc", "s3member"]:
|
||||
for env in ["ad_dc", "s3member"]:
|
||||
plansmbtorture4testsuite(t, env, '//$SERVER/tmp -U$DC_USERNAME@$REALM%$DC_PASSWORD --option=torture:addc=$DC_SERVER')
|
||||
plansmbtorture4testsuite(t, env, '//$SERVER/tmp -k yes -U$DC_USERNAME@$REALM%$DC_PASSWORD --option=torture:addc=$DC_SERVER', description='kerberos connection')
|
||||
plansmbtorture4testsuite(t, env, '//$SERVER/tmpguest -U% --option=torture:addc=$DC_SERVER', description='anonymous connection')
|
||||
elif t == "raw.samba3posixtimedlock":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/s3dc/share')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/plugin_s4_dc/share')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/ad_dc/share')
|
||||
elif t == "raw.chkpath":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
|
||||
elif t == "raw.samba3hide" or t == "raw.samba3checkfsp" or t == "raw.samba3closeerr":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "simpleserver", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
elif t == "raw.session" or t == "smb2.session":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'plain')
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmpenc -U$USERNAME%$PASSWORD', 'enc')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -k no -U$USERNAME%$PASSWORD', 'ntlm')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -k yes -U$USERNAME%$PASSWORD', 'krb5')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -k no -U$USERNAME%$PASSWORD', 'ntlm')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -k yes -U$USERNAME%$PASSWORD', 'krb5')
|
||||
elif t == "rpc.lsa":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'over ncacn_np ')
|
||||
plansmbtorture4testsuite(t, "s3dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'over ncacn_np ')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'over ncacn_np ')
|
||||
plansmbtorture4testsuite(t, "ad_dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ')
|
||||
elif t == "rpc.samr.passwords.validate":
|
||||
plansmbtorture4testsuite(t, "s3dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ')
|
||||
plansmbtorture4testsuite(t, "ad_dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ')
|
||||
elif t == "smb2.durable-open" or t == "smb2.durable-v2-open" or t == "smb2.replay":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/durable -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/durable -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/durable -U$USERNAME%$PASSWORD')
|
||||
elif t == "base.rw1":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/valid-users-tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/write-list-tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
elif t == "idmap.rfc2307":
|
||||
plantestsuite(t, "s3member_rfc2307", [os.path.join(samba3srcdir, "../nsswitch/tests/test_idmap_rfc2307.sh"), '$DOMAIN', 'Administrator', '2000000', '"Domain Users"', '2000001', 'ou=idmap,dc=samba,dc=example,dc=com', '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD'])
|
||||
elif t == "raw.acls":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/nfs4acl_simple -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-simple')
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/nfs4acl_special -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-special')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
|
||||
elif t == "smb2.ioctl":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/fs_specific -U$USERNAME%$PASSWORD', 'fs_specific')
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
elif t == "smb2.lock":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio')
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
elif t == "raw.read":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
elif t == "raw.search":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
|
||||
# test the dirsort module.
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmpsort -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
elif t == "vfs.fruit":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=torture:share1=vfs_fruit --option=torture:share2=tmp --option=torture:localdir=$SELFTEST_PREFIX/s3dc/share')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=torture:share1=vfs_fruit --option=torture:share2=tmp --option=torture:localdir=$SELFTEST_PREFIX/plugin_s4_dc/share')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=torture:share1=vfs_fruit --option=torture:share2=tmp --option=torture:localdir=$SELFTEST_PREFIX/ad_dc/share')
|
||||
elif t == "rpc.schannel_anon_setpw":
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$%', description="anonymous password set")
|
||||
plansmbtorture4testsuite(t, "s3dc_schannel", '//$SERVER_IP/tmp -U$%', description="anonymous password set (schannel enforced server-side)")
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$%', description="anonymous password set")
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$%', description="anonymous password set")
|
||||
elif t == "local.nss":
|
||||
for env in ["s3dc:local", "s3member:local", "member:local", "plugin_s4_dc:local", "dc:local"]:
|
||||
for env in ["s3dc:local", "s3member:local", "member:local", "ad_dc:local", "dc:local"]:
|
||||
plansmbtorture4testsuite(t, env, '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
else:
|
||||
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
|
||||
|
||||
|
||||
test = 'rpc.lsa.lookupsids'
|
||||
|
||||
@ -115,7 +115,7 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
|
||||
#
|
||||
for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
|
||||
for t in ncacn_np_tests:
|
||||
env = "plugin_s4_dc"
|
||||
env = "ad_dc"
|
||||
transport = "ncacn_np"
|
||||
plansmbtorture4testsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s with %s" % (t, bindoptions))
|
||||
|
||||
@ -140,7 +140,7 @@ for transport in ["ncacn_np", "ncacn_ip_tcp"]:
|
||||
# Tests for the DFS referral calls implementation
|
||||
for t in smbtorture4_testsuites("dfs."):
|
||||
plansmbtorture4testsuite(t, "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
|
||||
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
|
||||
|
||||
# Tests for the NET API (net.api.become.dc tested below against all the roles)
|
||||
net_tests = filter(lambda x: "net.api.become.dc" not in x, smbtorture4_testsuites("net."))
|
||||
@ -176,7 +176,7 @@ plantestsuite("samba.blackbox.pdbtest.s4winbind_wbclient(dc)", "dc:local", [os.p
|
||||
transports = ["ncacn_np", "ncacn_ip_tcp"]
|
||||
|
||||
#Kerberos varies between functional levels, so it is important to check this on all of them
|
||||
for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc", "plugin_s4_dc"]:
|
||||
for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc", "ad_dc"]:
|
||||
transport = "ncacn_np"
|
||||
plansmbtorture4testsuite('rpc.pac', env, ["%s:$SERVER[]" % (transport, ), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.pac on %s" % (transport,))
|
||||
plansmbtorture4testsuite('rpc.lsa.secrets', env, ["%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'], "samba4.rpc.lsa.secrets on %s with Kerberos" % (transport,))
|
||||
@ -351,8 +351,8 @@ for mech in [
|
||||
name = "smb.signing disabled on with %s" % signoptions
|
||||
plansmbtorture4testsuite('base.xcopy', "s4member", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s domain-creds" % name)
|
||||
plansmbtorture4testsuite('base.xcopy', "s3member", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s domain-creds" % name)
|
||||
plansmbtorture4testsuite('base.xcopy', "plugin_s4_dc", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$USERNAME%$PASSWORD'], "samba4.%s" % name)
|
||||
plansmbtorture4testsuite('base.xcopy', "plugin_s4_dc",
|
||||
plansmbtorture4testsuite('base.xcopy', "ad_dc", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$USERNAME%$PASSWORD'], "samba4.%s" % name)
|
||||
plansmbtorture4testsuite('base.xcopy', "ad_dc",
|
||||
['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s administrator" % name)
|
||||
|
||||
plantestsuite("samba4.blackbox.bogusdomain", "s3member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD', smbclient4])
|
||||
@ -372,7 +372,7 @@ wb_opts = ["--option=\"torture:strict mode=no\"", "--option=\"torture:timelimit=
|
||||
|
||||
winbind_ad_client_tests = smbtorture4_testsuites("winbind.struct") + smbtorture4_testsuites("winbind.pac")
|
||||
winbind_wbclient_tests = smbtorture4_testsuites("winbind.wbclient")
|
||||
for env in ["plugin_s4_dc", "s4member", "s3member"]:
|
||||
for env in ["ad_dc", "s4member", "s3member"]:
|
||||
for t in winbind_ad_client_tests:
|
||||
plansmbtorture4testsuite(t, "%s:local" % env, wb_opts + ['//$SERVER/tmp', '--realm=$REALM', '--machine-pass', '--option=torture:addc=$DC_SERVER'])
|
||||
|
||||
@ -380,7 +380,7 @@ for env in ["s3dc", "fl2003dc"]:
|
||||
for t in winbind_wbclient_tests:
|
||||
plansmbtorture4testsuite(t, "%s:local" % env, '//$SERVER/tmp -U$DC_USERNAME%$DC_PASSWORD')
|
||||
|
||||
for env in ["s3dc", "member", "plugin_s4_dc", "dc", "s3member", "s4member"]:
|
||||
for env in ["s3dc", "member", "ad_dc", "dc", "s3member", "s4member"]:
|
||||
tests = ["--ping", "--separator",
|
||||
"--own-domain",
|
||||
"--all-domains",
|
||||
@ -419,7 +419,7 @@ for env in ["s3dc", "member", "plugin_s4_dc", "dc", "s3member", "s4member"]:
|
||||
|
||||
|
||||
nsstest4 = binpath("nsstest")
|
||||
for env in ["plugin_s4_dc:local", "dc:local", "s4member:local", "s3dc:local", "s3member:local", "member:local"]:
|
||||
for env in ["ad_dc:local", "dc:local", "s4member:local", "s3dc:local", "s3member:local", "member:local"]:
|
||||
if os.path.exists(nsstest4):
|
||||
plantestsuite("samba.nss.test using winbind(%s)" % env, env, [os.path.join(bbdir, "nsstest.sh"), nsstest4, os.path.join(samba4bindir, "shared/libnss_wrapper_winbind.so.2")])
|
||||
else:
|
||||
@ -451,17 +451,17 @@ planpythontestsuite("dc:local", "samba.tests.samba_tool.timecmd")
|
||||
# the only test we have of GPO get/set behaviour, and this involves
|
||||
# the file server as well as the LDAP server.
|
||||
planpythontestsuite("dc:local", "samba.tests.samba_tool.gpo")
|
||||
planpythontestsuite("plugin_s4_dc:local", "samba.tests.samba_tool.gpo")
|
||||
planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.gpo")
|
||||
|
||||
planpythontestsuite("dc:local", "samba.tests.samba_tool.processes")
|
||||
planpythontestsuite("dc:local", "samba.tests.samba_tool.user")
|
||||
planpythontestsuite("dc:local", "samba.tests.samba_tool.group")
|
||||
planpythontestsuite("plugin_s4_dc:local", "samba.tests.samba_tool.ntacl")
|
||||
planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.ntacl")
|
||||
|
||||
planpythontestsuite("dc:local", "samba.tests.dcerpc.rpcecho")
|
||||
planoldpythontestsuite("dc:local", "samba.tests.dcerpc.registry", extra_args=['-U"$USERNAME%$PASSWORD"'])
|
||||
planoldpythontestsuite("dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
|
||||
planoldpythontestsuite("plugin_s4_dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
|
||||
planoldpythontestsuite("ad_dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
|
||||
plantestsuite_loadlist("samba4.ldap.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/ldap.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
|
||||
plantestsuite_loadlist("samba4.tokengroups.python(dc)", "dc:local", [python, os.path.join(samba4srcdir, "dsdb/tests/python/token_group.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
|
||||
plantestsuite("samba4.sam.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/sam.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN'])
|
||||
@ -492,8 +492,8 @@ for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
|
||||
)
|
||||
|
||||
planpythontestsuite("dc:local", "samba.tests.upgradeprovisionneeddc")
|
||||
planpythontestsuite("plugin_s4_dc:local", "samba.tests.posixacl")
|
||||
planpythontestsuite("plugin_s4_dc_no_nss:local", "samba.tests.posixacl")
|
||||
planpythontestsuite("ad_dc:local", "samba.tests.posixacl")
|
||||
planpythontestsuite("ad_dc_no_nss:local", "samba.tests.posixacl")
|
||||
plantestsuite_loadlist("samba4.deletetest.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"),
|
||||
'$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
|
||||
plantestsuite("samba4.blackbox.samba3dump", "none", [os.path.join(samba4srcdir, "selftest/test_samba3dump.sh")])
|
||||
@ -550,10 +550,10 @@ for env in ['vampire_dc', 'promoted_dc']:
|
||||
|
||||
plantestsuite("samba4.blackbox.samba_tool_demote(%s)" % env, env, [os.path.join(samba4srcdir, "utils/tests/test_demote.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', '$DC_SERVER', '$PREFIX/%s' % env, smbclient4])
|
||||
|
||||
for env in ["dc", "s4member", "rodc", "promoted_dc", "plugin_s4_dc", "s3member"]:
|
||||
for env in ["dc", "s4member", "rodc", "promoted_dc", "ad_dc", "s3member"]:
|
||||
plantestsuite("samba.blackbox.wbinfo(%s:local)" % env, "%s:local" % env, [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', env])
|
||||
|
||||
for env in ["dc", "rodc", "promoted_dc", "plugin_s4_dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
|
||||
for env in ["dc", "rodc", "promoted_dc", "ad_dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
|
||||
if env == "rodc":
|
||||
extra_options = ['--option=torture:expect_rodc=true']
|
||||
else:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user