Commit c157baa4 authored by Michael Adam's avatar Michael Adam Committed by Andrew Bartlett

selftest: rename env s3dc to nt4_dc

Signed-off-by: default avatarMichael Adam <obnox@samba.org>
Reviewed-by: default avatarAndrew Bartlett <abartlet@samba.org>
parent 10afe88e
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
^samba3.rpc.spoolss.printer.*addprinter.print_test # fails on some hosts due to timing issues ? ^samba3.rpc.spoolss.printer.*addprinter.print_test # fails on some hosts due to timing issues ?
^samba3.rpc.spoolss.printer.addprinter.print_job_enum # fails on some hosts due to bug 10930 ^samba3.rpc.spoolss.printer.addprinter.print_job_enum # fails on some hosts due to bug 10930
^samba3.rpc.spoolss.printer.addprinterex.print_job_enum # fails on some hosts due to bug 10930 ^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 ^samba3.rpc.lsa.privileges.lsa.Privileges\(nt4_dc\) # fails sometimes on sn-devel
^samba4.blackbox.gentest # is flakey due to timing ^samba4.blackbox.gentest # is flakey due to timing
^samba3.smb2.acls.INHERITANCE\(ad_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.smb2.acls.DYNAMIC\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16
......
...@@ -21,37 +21,37 @@ ...@@ -21,37 +21,37 @@
^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).BAD-NBT-SESSION # Fails against the s4 ntvfs server ^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).BAD-NBT-SESSION # Fails against the s4 ntvfs server
^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).SMB2-SESSION-REAUTH # Fails against the s4 ntvfs server ^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).SMB2-SESSION-REAUTH # Fails against the s4 ntvfs server
^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).SMB2-SESSION-RECONNECT # Fails against the s4 ntvfs server ^samba3.smbtorture_s3.plain\(ad_dc_ntvfs\).SMB2-SESSION-RECONNECT # Fails against the s4 ntvfs server
^samba3.smbtorture_s3.crypt_server\(s3dc\).SMB2-SESSION-REAUTH # expected to give ACCESS_DENIED SMB2.1 doesn't have encryption ^samba3.smbtorture_s3.crypt_server\(nt4_dc\).SMB2-SESSION-REAUTH # expected to give ACCESS_DENIED SMB2.1 doesn't have encryption
^samba3.smbtorture_s3.crypt_server\(s3dc\).SMB2-SESSION-RECONNECT # expected to give CONNECTION_DISCONNECTED, we need to fix the test ^samba3.smbtorture_s3.crypt_server\(nt4_dc\).SMB2-SESSION-RECONNECT # expected to give CONNECTION_DISCONNECTED, we need to fix the test
^samba3.smb2.session enc.reconnect # expected to give CONNECTION_DISCONNECTED, we need to fix the test ^samba3.smb2.session enc.reconnect # expected to give CONNECTION_DISCONNECTED, we need to fix the test
^samba3.raw.session enc # expected to give ACCESS_DENIED as SMB1 encryption isn't used ^samba3.raw.session enc # expected to give ACCESS_DENIED as SMB1 encryption isn't used
^samba3.smbtorture_s3.crypt_server # expected to give ACCESS_DENIED as SMB1 encryption isn't used ^samba3.smbtorture_s3.crypt_server # expected to give ACCESS_DENIED as SMB1 encryption isn't used
^samba3.nbt.dgram.*netlogon2\(s3dc\) ^samba3.nbt.dgram.*netlogon2\(nt4_dc\)
^samba3.*rap.sam.*.useradd # Not provided by Samba 3 ^samba3.*rap.sam.*.useradd # Not provided by Samba 3
^samba3.*rap.sam.*.userdelete # Not provided by Samba 3 ^samba3.*rap.sam.*.userdelete # Not provided by Samba 3
^samba3.libsmbclient.opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered ^samba3.libsmbclient.opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered
# see bug 8412 # see bug 8412
^samba3.smb2.rename.*.simple_nodelete ^samba3.smb2.rename.*.simple_nodelete
^samba3.smb2.rename.*.no_share_delete_no_delete_access ^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.blackbox.smbclient_machine_auth.plain \(nt4_dc:local\)# the NT4 DC does not currently set up a self-join
^samba3.raw.samba3hide.samba3hide\((s3dc|ad_dc)\) # This test fails against an smbd environment with NT ACLs enabled ^samba3.raw.samba3hide.samba3hide\((nt4_dc|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.samba3closeerr.samba3closeerr\(nt4_dc\) # 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.INHERITFLAGS\(nt4_dc\) # 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\) ^samba3.raw.acls nfs4acl_xattr-simple.sd\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-simple.create_file\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-simple.create_file\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-simple.create_dir\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-simple.create_dir\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-simple.nulldacl\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-simple.nulldacl\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-simple.generic\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-simple.generic\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-simple.inheritance\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-simple.inheritance\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-special.INHERITFLAGS\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-special.INHERITFLAGS\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-special.sd\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-special.sd\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-special.create_file\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-special.create_file\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-special.create_dir\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-special.create_dir\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-special.nulldacl\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-special.nulldacl\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-special.generic\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-special.generic\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-special.inheritance\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-special.inheritance\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_owner\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_owner\(nt4_dc\)
^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_group\(s3dc\) ^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_group\(nt4_dc\)
^samba3.base.delete.deltest16a ^samba3.base.delete.deltest16a
^samba3.base.delete.deltest17a ^samba3.base.delete.deltest17a
^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\(ad_dc\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token
...@@ -211,8 +211,8 @@ ...@@ -211,8 +211,8 @@
^samba3.smb2.replay.replay4 ^samba3.smb2.replay.replay4
^samba3.smb2.lock.*replay ^samba3.smb2.lock.*replay
^samba3.raw.session.*reauth2 # maybe fix this? ^samba3.raw.session.*reauth2 # maybe fix this?
^samba3.rpc.samr.passwords.badpwdcount.samr.badPwdCount\(s3dc\) # We fail this test currently ^samba3.rpc.samr.passwords.badpwdcount.samr.badPwdCount\(nt4_dc\) # We fail this test currently
^samba3.rpc.samr.passwords.lockout.*\(s3dc\)$ # We fail this test currently ^samba3.rpc.samr.passwords.lockout.*\(nt4_dc\)$ # We fail this test currently
^samba3.rpc.spoolss.printer.addprinter.driver_info_winreg # knownfail or flapping? ^samba3.rpc.spoolss.printer.addprinter.driver_info_winreg # knownfail or flapping?
^samba3.rpc.spoolss.printer.addprinterex.driver_info_winreg # knownfail or flapping? ^samba3.rpc.spoolss.printer.addprinterex.driver_info_winreg # knownfail or flapping?
^samba3.rpc.spoolss.printer.*.publish_toggle\(.*\)$ # needs spoolss AD member env ^samba3.rpc.spoolss.printer.*.publish_toggle\(.*\)$ # needs spoolss AD member env
......
...@@ -158,7 +158,7 @@ sub get_interface($) ...@@ -158,7 +158,7 @@ sub get_interface($)
$netbiosname = lc($netbiosname); $netbiosname = lc($netbiosname);
my %interfaces = (); my %interfaces = ();
$interfaces{"locals3dc2"} = 3; $interfaces{"localnt4dc2"} = 3;
$interfaces{"localmember3"} = 4; $interfaces{"localmember3"} = 4;
$interfaces{"localshare4"} = 5; $interfaces{"localshare4"} = 5;
......
...@@ -173,8 +173,8 @@ sub setup_env($$$) ...@@ -173,8 +173,8 @@ sub setup_env($$$)
return $self->{vars}->{$envname}; return $self->{vars}->{$envname};
} }
if ($envname eq "s3dc") { if ($envname eq "nt4_dc") {
return $self->setup_s3dc("$path/s3dc"); return $self->setup_nt4_dc("$path/nt4_dc");
} elsif ($envname eq "s3dc_schannel") { } elsif ($envname eq "s3dc_schannel") {
return $self->setup_s3dc_schannel("$path/s3dc_schannel"); return $self->setup_s3dc_schannel("$path/s3dc_schannel");
} elsif ($envname eq "simpleserver") { } elsif ($envname eq "simpleserver") {
...@@ -184,24 +184,24 @@ sub setup_env($$$) ...@@ -184,24 +184,24 @@ sub setup_env($$$)
} elsif ($envname eq "ktest") { } elsif ($envname eq "ktest") {
return $self->setup_ktest("$path/ktest"); return $self->setup_ktest("$path/ktest");
} elsif ($envname eq "member") { } elsif ($envname eq "member") {
if (not defined($self->{vars}->{s3dc})) { if (not defined($self->{vars}->{nt4_dc})) {
if (not defined($self->setup_s3dc("$path/s3dc"))) { if (not defined($self->setup_nt4_dc("$path/nt4_dc"))) {
return undef; return undef;
} }
} }
return $self->setup_member("$path/member", $self->{vars}->{s3dc}); return $self->setup_member("$path/member", $self->{vars}->{nt4_dc});
} else { } else {
return "UNKNOWN"; return "UNKNOWN";
} }
} }
sub setup_s3dc($$) sub setup_nt4_dc($$)
{ {
my ($self, $path) = @_; my ($self, $path) = @_;
print "PROVISIONING S3DC..."; print "PROVISIONING NT4 DC...";
my $s3dc_options = " my $nt4_dc_options = "
domain master = yes domain master = yes
domain logons = yes domain logons = yes
lanman auth = yes lanman auth = yes
...@@ -219,9 +219,9 @@ sub setup_s3dc($$) ...@@ -219,9 +219,9 @@ sub setup_s3dc($$)
"; ";
my $vars = $self->provision($path, my $vars = $self->provision($path,
"LOCALS3DC2", "LOCALNT4DC2",
"locals3dc2pass", "localntdc2pass",
$s3dc_options); $nt4_dc_options);
$vars or return undef; $vars or return undef;
...@@ -236,7 +236,7 @@ sub setup_s3dc($$) ...@@ -236,7 +236,7 @@ sub setup_s3dc($$)
$vars->{DC_USERNAME} = $vars->{USERNAME}; $vars->{DC_USERNAME} = $vars->{USERNAME};
$vars->{DC_PASSWORD} = $vars->{PASSWORD}; $vars->{DC_PASSWORD} = $vars->{PASSWORD};
$self->{vars}->{s3dc} = $vars; $self->{vars}->{nt4_dc} = $vars;
return $vars; return $vars;
} }
...@@ -291,7 +291,7 @@ sub setup_s3dc_schannel($$) ...@@ -291,7 +291,7 @@ sub setup_s3dc_schannel($$)
sub setup_member($$$) sub setup_member($$$)
{ {
my ($self, $prefix, $s3dcvars) = @_; my ($self, $prefix, $nt4_dc_vars) = @_;
my $count = 0; my $count = 0;
my $rc; my $rc;
...@@ -327,8 +327,8 @@ sub setup_member($$$) ...@@ -327,8 +327,8 @@ sub setup_member($$$)
my $net = Samba::bindir_path($self, "net"); my $net = Samba::bindir_path($self, "net");
my $cmd = ""; my $cmd = "";
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
$cmd .= "$net join $ret->{CONFIGURATION} $s3dcvars->{DOMAIN} member"; $cmd .= "$net join $ret->{CONFIGURATION} $nt4_dc_vars->{DOMAIN} member";
$cmd .= " -U$s3dcvars->{USERNAME}\%$s3dcvars->{PASSWORD}"; $cmd .= " -U$nt4_dc_vars->{USERNAME}\%$nt4_dc_vars->{PASSWORD}";
if (system($cmd) != 0) { if (system($cmd) != 0) {
warn("Join failed\n$cmd"); warn("Join failed\n$cmd");
...@@ -339,12 +339,12 @@ sub setup_member($$$) ...@@ -339,12 +339,12 @@ sub setup_member($$$)
return undef; return undef;
} }
$ret->{DC_SERVER} = $s3dcvars->{SERVER}; $ret->{DC_SERVER} = $nt4_dc_vars->{SERVER};
$ret->{DC_SERVER_IP} = $s3dcvars->{SERVER_IP}; $ret->{DC_SERVER_IP} = $nt4_dc_vars->{SERVER_IP};
$ret->{DC_SERVER_IPV6} = $s3dcvars->{SERVER_IPV6}; $ret->{DC_SERVER_IPV6} = $nt4_dc_vars->{SERVER_IPV6};
$ret->{DC_NETBIOSNAME} = $s3dcvars->{NETBIOSNAME}; $ret->{DC_NETBIOSNAME} = $nt4_dc_vars->{NETBIOSNAME};
$ret->{DC_USERNAME} = $s3dcvars->{USERNAME}; $ret->{DC_USERNAME} = $nt4_dc_vars->{USERNAME};
$ret->{DC_PASSWORD} = $s3dcvars->{PASSWORD}; $ret->{DC_PASSWORD} = $nt4_dc_vars->{PASSWORD};
return $ret; return $ret;
} }
......
...@@ -127,7 +127,7 @@ def get_interface(netbiosname): ...@@ -127,7 +127,7 @@ def get_interface(netbiosname):
netbiosname = netbiosname.lower() netbiosname = netbiosname.lower()
interfaces = { interfaces = {
"locals3dc2": 2, "localnt4dc2": 2,
"localmember3": 3, "localmember3": 3,
"localshare4": 4, "localshare4": 4,
"localserver5": 5, "localserver5": 5,
......
This diff is collapsed.
...@@ -151,7 +151,7 @@ for t in net_tests: ...@@ -151,7 +151,7 @@ for t in net_tests:
# FIXME: Integrate these into a single smbtorture test # FIXME: Integrate these into a single smbtorture test
transport = "ncacn_np" transport = "ncacn_np"
for env in ["ad_dc_ntvfs", "s3dc"]: for env in ["ad_dc_ntvfs", "nt4_dc"]:
for ntlmoptions in [ for ntlmoptions in [
"-k no --option=usespnego=yes", "-k no --option=usespnego=yes",
"-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no", "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no",
...@@ -287,7 +287,7 @@ for t in smbtorture4_testsuites("dlz_bind9."): ...@@ -287,7 +287,7 @@ for t in smbtorture4_testsuites("dlz_bind9."):
#The dlz_bind9 tests needs to look at the DNS database #The dlz_bind9 tests needs to look at the DNS database
plansmbtorture4testsuite(t, "chgdcpass:local", ["ncalrpc:$SERVER", '-U$USERNAME%$PASSWORD']) plansmbtorture4testsuite(t, "chgdcpass:local", ["ncalrpc:$SERVER", '-U$USERNAME%$PASSWORD'])
planpythontestsuite("s3dc", "samba.tests.libsmb_samba_internal"); planpythontestsuite("nt4_dc", "samba.tests.libsmb_samba_internal");
# Blackbox Tests: # Blackbox Tests:
# tests that interact directly with the command-line tools rather than using # tests that interact directly with the command-line tools rather than using
...@@ -376,11 +376,11 @@ for env in ["ad_dc", "s4member", "ad_member"]: ...@@ -376,11 +376,11 @@ for env in ["ad_dc", "s4member", "ad_member"]:
for t in winbind_ad_client_tests: 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']) plansmbtorture4testsuite(t, "%s:local" % env, wb_opts + ['//$SERVER/tmp', '--realm=$REALM', '--machine-pass', '--option=torture:addc=$DC_SERVER'])
for env in ["s3dc", "fl2003dc"]: for env in ["nt4_dc", "fl2003dc"]:
for t in winbind_wbclient_tests: for t in winbind_wbclient_tests:
plansmbtorture4testsuite(t, "%s:local" % env, '//$SERVER/tmp -U$DC_USERNAME%$DC_PASSWORD') plansmbtorture4testsuite(t, "%s:local" % env, '//$SERVER/tmp -U$DC_USERNAME%$DC_PASSWORD')
for env in ["s3dc", "member", "ad_dc", "ad_dc_ntvfs", "ad_member", "s4member"]: for env in ["nt4_dc", "member", "ad_dc", "ad_dc_ntvfs", "ad_member", "s4member"]:
tests = ["--ping", "--separator", tests = ["--ping", "--separator",
"--own-domain", "--own-domain",
"--all-domains", "--all-domains",
...@@ -419,7 +419,7 @@ for env in ["s3dc", "member", "ad_dc", "ad_dc_ntvfs", "ad_member", "s4member"]: ...@@ -419,7 +419,7 @@ for env in ["s3dc", "member", "ad_dc", "ad_dc_ntvfs", "ad_member", "s4member"]:
nsstest4 = binpath("nsstest") nsstest4 = binpath("nsstest")
for env in ["ad_dc:local", "ad_dc_ntvfs:local", "s4member:local", "s3dc:local", "ad_member:local", "member:local"]: for env in ["ad_dc:local", "ad_dc_ntvfs:local", "s4member:local", "nt4_dc:local", "ad_member:local", "member:local"]:
if os.path.exists(nsstest4): 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")]) 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: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment