diff options
| -rw-r--r-- | selftest/flapping | 2 | ||||
| -rw-r--r-- | selftest/knownfail | 48 | ||||
| -rw-r--r-- | selftest/target/Samba.pm | 2 | ||||
| -rwxr-xr-x | selftest/target/Samba3.pm | 42 | ||||
| -rw-r--r-- | selftest/target/samba.py | 2 | ||||
| -rwxr-xr-x | source3/selftest/tests.py | 134 | ||||
| -rwxr-xr-x | source4/selftest/tests.py | 10 |
7 files changed, 120 insertions, 120 deletions
diff --git a/selftest/flapping b/selftest/flapping index ae605c272a3..f0390041c81 100644 --- a/selftest/flapping +++ b/selftest/flapping @@ -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_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 ^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 diff --git a/selftest/knownfail b/selftest/knownfail index 75218eb6bb8..598fb4d2b5a 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -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\).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.crypt_server\(s3dc\).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-REAUTH # expected to give ACCESS_DENIED SMB2.1 doesn't have encryption +^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.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.nbt.dgram.*netlogon2\(s3dc\) +^samba3.nbt.dgram.*netlogon2\(nt4_dc\) ^samba3.*rap.sam.*.useradd # 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 # see bug 8412 ^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|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\) -^samba3.raw.acls nfs4acl_xattr-simple.create_file\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-simple.create_dir\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-simple.nulldacl\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-simple.generic\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-simple.inheritance\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-special.INHERITFLAGS\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-special.sd\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-special.create_file\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-special.create_dir\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-special.nulldacl\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-special.generic\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-special.inheritance\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_owner\(s3dc\) -^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_group\(s3dc\) +^samba3.blackbox.smbclient_machine_auth.plain \(nt4_dc:local\)# the NT4 DC does not currently set up a self-join +^samba3.raw.samba3hide.samba3hide\((nt4_dc|ad_dc)\) # 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\(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\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-simple.create_file\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-simple.create_dir\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-simple.nulldacl\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-simple.generic\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-simple.inheritance\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-special.INHERITFLAGS\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-special.sd\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-special.create_file\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-special.create_dir\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-special.nulldacl\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-special.generic\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-special.inheritance\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_owner\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_group\(nt4_dc\) ^samba3.base.delete.deltest16a ^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 @@ -211,8 +211,8 @@ ^samba3.smb2.replay.replay4 ^samba3.smb2.lock.*replay ^samba3.raw.session.*reauth2 # maybe fix this? -^samba3.rpc.samr.passwords.badpwdcount.samr.badPwdCount\(s3dc\) # We fail this test currently -^samba3.rpc.samr.passwords.lockout.*\(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.*\(nt4_dc\)$ # We fail this test currently ^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.*.publish_toggle\(.*\)$ # needs spoolss AD member env diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index 3647f420f7b..524c2ef4b3d 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -158,7 +158,7 @@ sub get_interface($) $netbiosname = lc($netbiosname); my %interfaces = (); - $interfaces{"locals3dc2"} = 3; + $interfaces{"localnt4dc2"} = 3; $interfaces{"localmember3"} = 4; $interfaces{"localshare4"} = 5; diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 934153c0537..23d00aa97eb 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -173,8 +173,8 @@ sub setup_env($$$) return $self->{vars}->{$envname}; } - if ($envname eq "s3dc") { - return $self->setup_s3dc("$path/s3dc"); + if ($envname eq "nt4_dc") { + return $self->setup_nt4_dc("$path/nt4_dc"); } elsif ($envname eq "s3dc_schannel") { return $self->setup_s3dc_schannel("$path/s3dc_schannel"); } elsif ($envname eq "simpleserver") { @@ -184,24 +184,24 @@ sub setup_env($$$) } elsif ($envname eq "ktest") { return $self->setup_ktest("$path/ktest"); } elsif ($envname eq "member") { - if (not defined($self->{vars}->{s3dc})) { - if (not defined($self->setup_s3dc("$path/s3dc"))) { + if (not defined($self->{vars}->{nt4_dc})) { + if (not defined($self->setup_nt4_dc("$path/nt4_dc"))) { return undef; } } - return $self->setup_member("$path/member", $self->{vars}->{s3dc}); + return $self->setup_member("$path/member", $self->{vars}->{nt4_dc}); } else { return "UNKNOWN"; } } -sub setup_s3dc($$) +sub setup_nt4_dc($$) { my ($self, $path) = @_; - print "PROVISIONING S3DC..."; + print "PROVISIONING NT4 DC..."; - my $s3dc_options = " + my $nt4_dc_options = " domain master = yes domain logons = yes lanman auth = yes @@ -219,9 +219,9 @@ sub setup_s3dc($$) "; my $vars = $self->provision($path, - "LOCALS3DC2", - "locals3dc2pass", - $s3dc_options); + "LOCALNT4DC2", + "localntdc2pass", + $nt4_dc_options); $vars or return undef; @@ -236,7 +236,7 @@ sub setup_s3dc($$) $vars->{DC_USERNAME} = $vars->{USERNAME}; $vars->{DC_PASSWORD} = $vars->{PASSWORD}; - $self->{vars}->{s3dc} = $vars; + $self->{vars}->{nt4_dc} = $vars; return $vars; } @@ -291,7 +291,7 @@ sub setup_s3dc_schannel($$) sub setup_member($$$) { - my ($self, $prefix, $s3dcvars) = @_; + my ($self, $prefix, $nt4_dc_vars) = @_; my $count = 0; my $rc; @@ -327,8 +327,8 @@ sub setup_member($$$) my $net = Samba::bindir_path($self, "net"); my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; - $cmd .= "$net join $ret->{CONFIGURATION} $s3dcvars->{DOMAIN} member"; - $cmd .= " -U$s3dcvars->{USERNAME}\%$s3dcvars->{PASSWORD}"; + $cmd .= "$net join $ret->{CONFIGURATION} $nt4_dc_vars->{DOMAIN} member"; + $cmd .= " -U$nt4_dc_vars->{USERNAME}\%$nt4_dc_vars->{PASSWORD}"; if (system($cmd) != 0) { warn("Join failed\n$cmd"); @@ -339,12 +339,12 @@ sub setup_member($$$) return undef; } - $ret->{DC_SERVER} = $s3dcvars->{SERVER}; - $ret->{DC_SERVER_IP} = $s3dcvars->{SERVER_IP}; - $ret->{DC_SERVER_IPV6} = $s3dcvars->{SERVER_IPV6}; - $ret->{DC_NETBIOSNAME} = $s3dcvars->{NETBIOSNAME}; - $ret->{DC_USERNAME} = $s3dcvars->{USERNAME}; - $ret->{DC_PASSWORD} = $s3dcvars->{PASSWORD}; + $ret->{DC_SERVER} = $nt4_dc_vars->{SERVER}; + $ret->{DC_SERVER_IP} = $nt4_dc_vars->{SERVER_IP}; + $ret->{DC_SERVER_IPV6} = $nt4_dc_vars->{SERVER_IPV6}; + $ret->{DC_NETBIOSNAME} = $nt4_dc_vars->{NETBIOSNAME}; + $ret->{DC_USERNAME} = $nt4_dc_vars->{USERNAME}; + $ret->{DC_PASSWORD} = $nt4_dc_vars->{PASSWORD}; return $ret; } diff --git a/selftest/target/samba.py b/selftest/target/samba.py index c7e1ada2e9f..f632a6963fe 100644 --- a/selftest/target/samba.py +++ b/selftest/target/samba.py @@ -127,7 +127,7 @@ def get_interface(netbiosname): netbiosname = netbiosname.lower() interfaces = { - "locals3dc2": 2, + "localnt4dc2": 2, "localmember3": 3, "localshare4": 4, "localserver5": 5, diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 7b1800dd3b7..a571f34cd47 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -37,12 +37,12 @@ def plansmbtorture4testsuite(name, env, options, description=''): name, env, options, target='samba3', modname=modname) -plantestsuite("samba3.blackbox.success", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_success.sh")]) -plantestsuite("samba3.blackbox.failure", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_failure.sh")]) +plantestsuite("samba3.blackbox.success", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_success.sh")]) +plantestsuite("samba3.blackbox.failure", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_failure.sh")]) -plantestsuite("samba3.local_s3", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_local_s3.sh")]) +plantestsuite("samba3.local_s3", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_local_s3.sh")]) -plantestsuite("samba3.blackbox.registry.upgrade", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_registry_upgrade.sh"), net, dbwrap_tool]) +plantestsuite("samba3.blackbox.registry.upgrade", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_registry_upgrade.sh"), net, dbwrap_tool]) tests = ["FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7", "LOCK9", "UNLINK", "BROWSE", "ATTR", "TRANS2", "TORTURE", @@ -60,19 +60,19 @@ tests = ["FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7" "BAD-NBT-SESSION"] for t in tests: - plantestsuite("samba3.smbtorture_s3.plain(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) - plantestsuite("samba3.smbtorture_s3.crypt_client(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"]) + plantestsuite("samba3.smbtorture_s3.plain(nt4_dc).%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) + plantestsuite("samba3.smbtorture_s3.crypt_client(nt4_dc).%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"]) if t == "TORTURE": # this is a negative test to verify that the server rejects # access without encryption - plantestsuite("samba3.smbtorture_s3.crypt_server(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmpenc', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) + plantestsuite("samba3.smbtorture_s3.crypt_server(nt4_dc).%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmpenc', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) plantestsuite("samba3.smbtorture_s3.plain(ad_dc_ntvfs).%s" % t, "ad_dc_ntvfs", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) # non-crypt only tests = ["OPLOCK-CANCEL"] for t in tests: - plantestsuite("samba3.smbtorture_s3.plain(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) + plantestsuite("samba3.smbtorture_s3.plain(nt4_dc).%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) tests = ["RW1", "RW2", "RW3"] for t in tests: @@ -81,11 +81,11 @@ for t in tests: posix_tests = ["POSIX", "POSIX-APPEND"] for t in posix_tests: - plantestsuite("samba3.smbtorture_s3.plain(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) - plantestsuite("samba3.smbtorture_s3.crypt(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"]) + plantestsuite("samba3.smbtorture_s3.plain(nt4_dc).%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) + plantestsuite("samba3.smbtorture_s3.crypt(nt4_dc).%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"]) plantestsuite("samba3.smbtorture_s3.plain(ad_dc_ntvfs).%s" % t, "ad_dc_ntvfs", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) -env = "s3dc:local" +env = "nt4_dc:local" t = "CLEANUP3" plantestsuite("samba3.smbtorture_s3.plain(%s).%s" % (env, t), env, [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "", "-l $LOCAL_PATH"]) @@ -118,19 +118,19 @@ local_tests = [ for t in local_tests: plantestsuite("samba3.smbtorture_s3.%s" % t, "none", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//foo/bar', '""', '""', smbtorture3, ""]) -plantestsuite("samba.vfstest.stream_depot", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/stream-depot/run.sh"), binpath("vfstest"), "$PREFIX", configuration]) -plantestsuite("samba.vfstest.xattr-tdb-1", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/xattr-tdb-1/run.sh"), binpath("vfstest"), "$PREFIX", configuration]) -plantestsuite("samba.vfstest.acl", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/vfstest-acl/run.sh"), binpath("vfstest"), "$PREFIX", configuration]) -plantestsuite("samba.vfstest.catia", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/vfstest-catia/run.sh"), binpath("vfstest"), "$PREFIX", configuration]) +plantestsuite("samba.vfstest.stream_depot", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/stream-depot/run.sh"), binpath("vfstest"), "$PREFIX", configuration]) +plantestsuite("samba.vfstest.xattr-tdb-1", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/xattr-tdb-1/run.sh"), binpath("vfstest"), "$PREFIX", configuration]) +plantestsuite("samba.vfstest.acl", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/vfstest-acl/run.sh"), binpath("vfstest"), "$PREFIX", configuration]) +plantestsuite("samba.vfstest.catia", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/vfstest-catia/run.sh"), binpath("vfstest"), "$PREFIX", configuration]) for options in ["--option=clientusespnego=no", " --option=clientntlmv2auth=no --option=clientlanmanauth=yes --max-protocol=LANMAN2", ""]: - env = "s3dc" + env = "nt4_dc" plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) %s" % (env, options), env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient3, configuration, options]) -for env in ["s3dc", "member", "ad_member", "ad_dc_ntvfs", "s4member"]: +for env in ["nt4_dc", "member", "ad_member", "ad_dc_ntvfs", "s4member"]: plantestsuite("samba3.blackbox.smbclient_machine_auth.plain (%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_machine_auth.sh"), '$SERVER', smbclient3, configuration]) -for env in ["s3dc", "member", "ad_member"]: +for env in ["nt4_dc", "member", "ad_member"]: plantestsuite("samba3.blackbox.smbclient_auth.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient3, configuration]) plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER/$USERNAME', '$PASSWORD', smbclient3, configuration]) @@ -156,19 +156,19 @@ env = "maptoguest" plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) bad username" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', 'notmy$USERNAME', '$PASSWORD', smbclient3, configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"]) # plain -for env in ["s3dc"]: +for env in ["nt4_dc"]: plantestsuite("samba3.blackbox.smbclient_s3.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration]) for env in ["member", "ad_member"]: plantestsuite("samba3.blackbox.smbclient_s3.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER/$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration]) -for env in ["s3dc"]: +for env in ["nt4_dc"]: plantestsuite("samba3.blackbox.smbclient_s3.sign (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration, "--signing=required"]) for env in ["member", "ad_member"]: plantestsuite("samba3.blackbox.smbclient_s3.sign (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER/$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration, "--signing=required"]) -for env in ["s3dc"]: +for env in ["nt4_dc"]: # encrypted plantestsuite("samba3.blackbox.smbclient_s3.crypt (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration, "-e"]) @@ -207,40 +207,40 @@ for env in ["s3dc"]: '--subunit', '--', configuration]) #TODO encrypted against member, with member creds, and with DC creds -plantestsuite("samba3.blackbox.net.misc", "s3dc:local", +plantestsuite("samba3.blackbox.net.misc", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"), scriptdir, "$SMB_CONF_PATH", net, configuration]) -plantestsuite("samba3.blackbox.net.local.registry", "s3dc:local", +plantestsuite("samba3.blackbox.net.local.registry", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"), scriptdir, "$SMB_CONF_PATH", net, configuration]) -plantestsuite("samba3.blackbox.net.registry.check", "s3dc:local", +plantestsuite("samba3.blackbox.net.registry.check", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_registry_check.sh"), scriptdir, "$SMB_CONF_PATH", net, configuration, dbwrap_tool]) -plantestsuite("samba3.blackbox.net.rpc.registry", "s3dc", +plantestsuite("samba3.blackbox.net.rpc.registry", "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"), scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc']) -plantestsuite("samba3.blackbox.net.local.registry.roundtrip", "s3dc:local", +plantestsuite("samba3.blackbox.net.local.registry.roundtrip", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"), scriptdir, "$SMB_CONF_PATH", net, configuration]) -plantestsuite("samba3.blackbox.net.rpc.registry.roundtrip", "s3dc", +plantestsuite("samba3.blackbox.net.rpc.registry.roundtrip", "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_net_registry_roundtrip.sh"), scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc']) -plantestsuite("samba3.blackbox.net.local.conf", "s3dc:local", +plantestsuite("samba3.blackbox.net.local.conf", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_net_conf.sh"), scriptdir, "$SMB_CONF_PATH", net, configuration]) -plantestsuite("samba3.blackbox.net.rpc.conf", "s3dc", +plantestsuite("samba3.blackbox.net.rpc.conf", "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_net_conf.sh"), scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc']) -plantestsuite("samba3.blackbox.testparm", "s3dc:local", +plantestsuite("samba3.blackbox.testparm", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_testparm_s3.sh"), "$LOCAL_PATH"]) plantestsuite( - "samba3.pthreadpool", "s3dc", + "samba3.pthreadpool", "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_pthreadpool.sh")]) #smbtorture4 tests @@ -302,14 +302,14 @@ for t in tests: if t == "base.delaywrite": 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, "nt4_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, "ad_member:local", '//$SERVER/tmp --realm=$REALM --machine-pass --option=torture:addc=$DC_SERVER', description="machine account") elif t == "unix.whoami": plansmbtorture4testsuite(t, "member:local", '//$SERVER/tmp --machine-pass', description="machine account") plansmbtorture4testsuite(t, "ad_member:local", '//$SERVER/tmp --machine-pass --option=torture:addc=$DC_SERVER', description="machine account") - for env in ["s3dc", "member"]: + for env in ["nt4_dc", "member"]: plansmbtorture4testsuite(t, env, '//$SERVER/tmp -U$DC_USERNAME%$DC_PASSWORD') plansmbtorture4testsuite(t, env, '//$SERVER/tmpguest -U%', description='anonymous connection') for env in ["ad_dc", "ad_member"]: @@ -317,72 +317,72 @@ for t in tests: 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, "nt4_dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_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, "nt4_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, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "simpleserver", '//$SERVER_IP/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, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'plain') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmpenc -U$USERNAME%$PASSWORD', 'enc') 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, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'over ncacn_np ') + plansmbtorture4testsuite(t, "nt4_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, "nt4_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, "nt4_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, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/valid-users-tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/write-list-tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD') elif t == "idmap.rfc2307": plantestsuite(t, "ad_member_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, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_simple -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-simple') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_special -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-special') 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, "nt4_dc", '//$SERVER_IP/fs_specific -U$USERNAME%$PASSWORD', 'fs_specific') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/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, "nt4_dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/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, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio') plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD') elif t == "raw.search": - plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') # test the dirsort module. - plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmpsort -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmpsort -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, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=torture:share1=vfs_fruit --option=torture:share2=tmp --option=torture:localdir=$SELFTEST_PREFIX/nt4_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, "nt4_dc", '//$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, "ad_dc", '//$SERVER/tmp -U$%', description="anonymous password set") elif t == "local.nss": - for env in ["s3dc:local", "ad_member:local", "member:local", "ad_dc:local", "ad_dc_ntvfs:local"]: + for env in ["nt4_dc:local", "ad_member:local", "member:local", "ad_dc:local", "ad_dc_ntvfs:local"]: plansmbtorture4testsuite(t, env, '//$SERVER/tmp -U$USERNAME%$PASSWORD') else: - plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD') @@ -395,8 +395,8 @@ for s in signseal_options: for a in auth_options: binding_string = "ncacn_np:$SERVER[%s%s%s]" % (a, s, e) options = binding_string + " -U$USERNAME%$PASSWORD" - plansmbtorture4testsuite(test, "s3dc", options, 'over ncacn_np with [%s%s%s] ' % (a, s, e)) - plantestsuite("samba3.blackbox.rpcclient over ncacn_np with [%s%s%s] " % (a, s, e), "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient.sh"), + plansmbtorture4testsuite(test, "nt4_dc", options, 'over ncacn_np with [%s%s%s] ' % (a, s, e)) + plantestsuite("samba3.blackbox.rpcclient over ncacn_np with [%s%s%s] " % (a, s, e), "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient.sh"), "none", options, configuration]) # We should try more combinations in future, but this is all @@ -420,11 +420,11 @@ for s in signseal_options: plantestsuite("samba3.blackbox.rpcclient_samlogon", "ad_member:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient_samlogon.sh"), "$DC_USERNAME", "$DC_PASSWORD", "ncacn_np:$DC_SERVER", configuration]) -plantestsuite("samba3.blackbox.net_dom_join_fail_dc", "s3dc", +plantestsuite("samba3.blackbox.net_dom_join_fail_dc", "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_net_dom_join_fail_dc.sh"), "$USERNAME", "$PASSWORD", "$SERVER", "$PREFIX/net_dom_join_fail_dc", configuration]) -plantestsuite("samba3.blackbox.net_rpc_join", "s3dc", +plantestsuite("samba3.blackbox.net_rpc_join", "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_net_rpc_join.sh"), "$USERNAME", "$PASSWORD", "$SERVER", "$PREFIX/net_rpc_join", configuration]) @@ -451,7 +451,7 @@ for options in options_list: "$PREFIX/ktest/krb5_ccache-3", smbclient3, "$SERVER", "$PREFIX", options, "-k " + configuration]) - plantestsuite("samba3.blackbox.smbclient_posix_large %s NTLM" % options, "s3dc:local", + plantestsuite("samba3.blackbox.smbclient_posix_large %s NTLM" % options, "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_smbclient_posix_large.sh"), "none", smbclient3, "$SERVER", "$PREFIX", options, "-U$USERNAME%$PASSWORD " + configuration]) @@ -461,6 +461,6 @@ for e in endianness_options: for s in signseal_options: binding_string = "ncacn_ip_tcp:$SERVER_IP[%s%s%s]" % (a, s, e) options = binding_string + " -U$USERNAME%$PASSWORD" - plansmbtorture4testsuite(test, "s3dc", options, 'over ncacn_ip_tcp with [%s%s%s] ' % (a, s, e)) + plansmbtorture4testsuite(test, "nt4_dc", options, 'over ncacn_ip_tcp with [%s%s%s] ' % (a, s, e)) -plansmbtorture4testsuite('rpc.epmapper', 's3dc:local', 'ncalrpc: -U$USERNAME%$PASSWORD', 'over ncalrpc') +plansmbtorture4testsuite('rpc.epmapper', 'nt4_dc:local', 'ncalrpc: -U$USERNAME%$PASSWORD', 'over ncalrpc') diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index b46a4ec41c1..bfd3dd0286d 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -151,7 +151,7 @@ for t in net_tests: # FIXME: Integrate these into a single smbtorture test transport = "ncacn_np" -for env in ["ad_dc_ntvfs", "s3dc"]: +for env in ["ad_dc_ntvfs", "nt4_dc"]: for ntlmoptions in [ "-k no --option=usespnego=yes", "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no", @@ -287,7 +287,7 @@ for t in smbtorture4_testsuites("dlz_bind9."): #The dlz_bind9 tests needs to look at the DNS database 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: # tests that interact directly with the command-line tools rather than using @@ -376,11 +376,11 @@ for env in ["ad_dc", "s4member", "ad_member"]: 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']) -for env in ["s3dc", "fl2003dc"]: +for env in ["nt4_dc", "fl2003dc"]: for t in winbind_wbclient_tests: 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", "--own-domain", "--all-domains", @@ -419,7 +419,7 @@ for env in ["s3dc", "member", "ad_dc", "ad_dc_ntvfs", "ad_member", "s4member"]: 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): 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: |