From 25f9ebf270648ee6c8bcc795d5a724e9920f8a6f Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 5 Mar 2015 23:46:14 +0100 Subject: [PATCH] selftest: rename env s3member to ad_member. Signed-off-by: Michael Adam Reviewed-by: Andrew Bartlett --- selftest/knownfail | 30 +++++++++++++++--------------- selftest/target/Samba4.pm | 4 ++-- source3/selftest/tests.py | 22 +++++++++++----------- source4/selftest/tests.py | 14 +++++++------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/selftest/knownfail b/selftest/knownfail index 0ddd07d8d8c..75218eb6bb8 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -55,7 +55,7 @@ ^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 -^samba3.unix.whoami anonymous connection.whoami\(s3member\) # smbd maps anonymous logins to domain guest in the local domain, not SID_NT_ANONYMOUS +^samba3.unix.whoami anonymous connection.whoami\(ad_member\) # 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 # internal iconv modules @@ -250,10 +250,10 @@ # # This makes less sense when not running against an AD DC # -^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U against s3member -^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G against s3member -^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U check for sane mapping -^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G check for sane mapping +^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -U against ad_member +^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G against ad_member +^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -U check for sane mapping +^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G check for sane mapping ^samba4.winbind.struct.show_sequence\(ad_dc_ntvfs\) ^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--allocate-uid ^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--allocate-gid @@ -281,16 +281,16 @@ ^samba3.local.nss.enumeration\(ad_dc_ntvfs:local\) # # These fail only if we run the unix.whoami test before them -# in the member and s3member environments. ==> Strange!!! +# in the member and ad_member environments. ==> Strange!!! # -^samba3.local.nss.reentrant enumeration crosschecks\(s3member:local\) -^samba3.local.nss.reentrant enumeration\(s3member:local\) -^samba3.local.nss.enumeration\(s3member:local\) +^samba3.local.nss.reentrant enumeration crosschecks\(ad_member:local\) +^samba3.local.nss.reentrant enumeration\(ad_member:local\) +^samba3.local.nss.enumeration\(ad_member:local\) # # These just happen to fail for some reason (probably because they run against the s4 winbind) # -^samba4.winbind.struct.getdcname\(s3member:local\) -^samba4.winbind.struct.lookup_name_sid\(s3member:local\) +^samba4.winbind.struct.getdcname\(ad_member:local\) +^samba4.winbind.struct.lookup_name_sid\(ad_member:local\) ^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--all-domains.wbinfo\(ad_dc_ntvfs:local\) ^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--trusted-domains.wbinfo\(ad_dc_ntvfs:local\) ^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--online-status.wbinfo\(ad_dc_ntvfs:local\) @@ -304,10 +304,10 @@ # # These do not work against winbindd in member mode for unknown reasons # -^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U against s3member\(s3member:local\) -^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U check for sane mapping\(s3member:local\) -^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G against s3member\(s3member:local\) -^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G check for sane mapping\(s3member:local\) +^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -U against ad_member\(ad_member:local\) +^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -U check for sane mapping\(ad_member:local\) +^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G against ad_member\(ad_member:local\) +^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G check for sane mapping\(ad_member:local\) ^samba.ntlm_auth.\(ad_dc_ntvfs:local\).ntlm_auth against winbindd with failed require-membership-of ^samba.ntlm_auth.\(ad_dc_ntvfs:local\).ntlm_auth with NTLMSSP gss-spnego-client and gss-spnego server against winbind with failed require-membership-of # diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index da49488d661..f7f6a99c5cb 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -1969,11 +1969,11 @@ sub setup_env($$$) return $self->setup_rodc("$path/rodc", $self->{vars}->{ad_dc_ntvfs}); } elsif ($envname eq "chgdcpass") { return $self->setup_chgdcpass("$path/chgdcpass", $self->{vars}->{chgdcpass}); - } elsif ($envname eq "s3member") { + } elsif ($envname eq "ad_member") { if (not defined($self->{vars}->{ad_dc_ntvfs})) { $self->setup_ad_dc_ntvfs("$path/ad_dc_ntvfs"); } - return $target3->setup_admember("$path/s3member", $self->{vars}->{ad_dc_ntvfs}, 29); + return $target3->setup_admember("$path/ad_member", $self->{vars}->{ad_dc_ntvfs}, 29); } elsif ($envname eq "ad_dc") { return $self->setup_ad_dc("$path/ad_dc"); } elsif ($envname eq "ad_dc_no_nss") { diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 71b3e3a275a..e2faa0d6422 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -127,17 +127,17 @@ for options in ["--option=clientusespnego=no", " --option=clientntlmv2auth=no -- env = "s3dc" 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", "s3member", "ad_dc_ntvfs", "s4member"]: +for env in ["s3dc", "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", "s3member"]: +for env in ["s3dc", "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]) -for env in ["member", "s3member"]: +for env in ["member", "ad_member"]: plantestsuite("samba3.blackbox.net_cred_change.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_net_cred_change.sh"), configuration]) -env = "s3member" +env = "ad_member" t = "--krb5auth=$DOMAIN/$DC_USERNAME%$DC_PASSWORD" plantestsuite("samba3.wbinfo_simple.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_simple.sh"), t]) t = "WBCLIENT-MULTI-PING" @@ -159,13 +159,13 @@ plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) bad username" % env, en for env in ["s3dc"]: 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", "s3member"]: +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"]: 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", "s3member"]: +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"]: @@ -305,14 +305,14 @@ for t in tests: plansmbtorture4testsuite(t, "s3dc", '//$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") + 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, "s3member:local", '//$SERVER/tmp --machine-pass --option=torture:addc=$DC_SERVER', 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"]: plansmbtorture4testsuite(t, env, '//$SERVER/tmp -U$DC_USERNAME%$DC_PASSWORD') plansmbtorture4testsuite(t, env, '//$SERVER/tmpguest -U%', description='anonymous connection') - for env in ["ad_dc", "s3member"]: + for env in ["ad_dc", "ad_member"]: 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') @@ -379,7 +379,7 @@ for t in tests: 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", "s3member:local", "member:local", "ad_dc:local", "ad_dc_ntvfs:local"]: + for env in ["s3dc: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') @@ -417,7 +417,7 @@ for s in signseal_options: plantestsuite("samba3.blackbox.rpcclient krb5 ncacn_np with [%s%s%s] " % (a, s, e), "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient.sh"), "$PREFIX/ktest/krb5_ccache-3", binding_string, "-k", configuration]) -plantestsuite("samba3.blackbox.rpcclient_samlogon", "s3member:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient_samlogon.sh"), +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", diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 49e8d0fb9a4..b46a4ec41c1 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -294,7 +294,7 @@ planpythontestsuite("s3dc", "samba.tests.libsmb_samba_internal"); # the API. These mainly test that the various command-line options of commands # work correctly. -for env in ["s3member", "s4member", "ad_dc_ntvfs", "chgdcpass"]: +for env in ["ad_member", "s4member", "ad_dc_ntvfs", "chgdcpass"]: plantestsuite("samba4.blackbox.smbclient(%s:local)" % env, "%s:local" % env, [os.path.join(samba4srcdir, "utils/tests/test_smbclient.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient4]) plantestsuite("samba4.blackbox.samba_tool(ad_dc_ntvfs:local)", "ad_dc_ntvfs:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient4]) @@ -350,12 +350,12 @@ for mech in [ signoptions = "%s --signing=off" % mech 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', "ad_member", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s domain-creds" % name) 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]) +plantestsuite("samba4.blackbox.bogusdomain", "ad_member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD', smbclient4]) for mech in [ "-k no", "-k no --option=usespnego=no", @@ -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 ["ad_dc", "s4member", "s3member"]: +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']) @@ -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", "ad_dc", "ad_dc_ntvfs", "s3member", "s4member"]: +for env in ["s3dc", "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", "s3member", "s4member"]: nsstest4 = binpath("nsstest") -for env in ["ad_dc:local", "ad_dc_ntvfs:local", "s4member:local", "s3dc:local", "s3member:local", "member:local"]: +for env in ["ad_dc:local", "ad_dc_ntvfs:local", "s4member:local", "s3dc: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: @@ -550,7 +550,7 @@ 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 ["ad_dc_ntvfs", "s4member", "rodc", "promoted_dc", "ad_dc", "s3member"]: +for env in ["ad_dc_ntvfs", "s4member", "rodc", "promoted_dc", "ad_dc", "ad_member"]: 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 ["ad_dc_ntvfs", "rodc", "promoted_dc", "ad_dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]: -- 2.11.4.GIT