From: Noel Power Date: Mon, 9 Dec 2019 18:11:41 +0000 (+0000) Subject: s4/selftest: Adjust samba4.blackbox.samba_tool to use (s3) smbclient X-Git-Tag: ldb-2.2.0~1090 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e04d84b5f1e5b0975f4fa0755786ed213739125;p=thirdparty%2Fsamba.git s4/selftest: Adjust samba4.blackbox.samba_tool to use (s3) smbclient (s4) smbclient doesn't negotiate smb2, (s3) smbclient is what is used and what we really should be testing. Additionally remove entry from ski_smb1_fails file Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 02d2568c5c5..60d9cd71b18 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -357,7 +357,6 @@ ^samba4.blackbox.kinit_trust\(fl2003dc:local\) ^samba4.blackbox.kinit_trust\(fl2008r2dc:local\) ^samba4.blackbox.pkinit\(ad_dc:local\) -^samba4.blackbox.samba_tool\(ad_dc_default:local\)\(ad_dc_default:local\) ^samba4.blackbox.smbclient\(ad_member:local\)\(ad_member:local\) ^samba4.blackbox.smbclient\(chgdcpass:local\)\(chgdcpass:local\) ^samba4.dfs.domain\(ad_dc\) diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 9aa92173a12..0ac6d8a7d89 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -461,7 +461,7 @@ planpythontestsuite("nt4_dc", "samba.tests.libsmb") 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_default:local)", "ad_dc_default:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient4]) +plantestsuite("samba4.blackbox.samba_tool(ad_dc_default:local)", "ad_dc_default:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient3]) plantestsuite("samba4.blackbox.net_rpc_user(ad_dc)", "ad_dc", [os.path.join(bbdir, "test_net_rpc_user.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN']) plantestsuite("samba4.blackbox.test_primary_group", "ad_dc:local", [os.path.join(bbdir, "test_primary_group.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX_ABS']) diff --git a/source4/utils/tests/test_samba_tool.sh b/source4/utils/tests/test_samba_tool.sh index 57dcb992f7b..d2548d04689 100755 --- a/source4/utils/tests/test_samba_tool.sh +++ b/source4/utils/tests/test_samba_tool.sh @@ -30,9 +30,9 @@ testit() { return $status } -testit "Test login with --machine-pass without kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k no +testit "Test login with --machine-pass without kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -testit "Test login with --machine-pass and kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k yes +testit "Test login with --machine-pass and kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k testit "time" $VALGRIND $PYTHON $samba_tool time $SERVER $CONFIGURATION -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@