From: Noel Power Date: Fri, 3 Apr 2020 13:14:58 +0000 (+0100) Subject: s3/selftest: Move samba3.blackbox.smbclient_ntlm.plain to nt4_dc_smb1 X-Git-Tag: ldb-2.2.0~1052 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=227095bb790345d455f3104001ccf15f2e3ae6f0;p=thirdparty%2Fsamba.git s3/selftest: Move samba3.blackbox.smbclient_ntlm.plain to nt4_dc_smb1 samba3.blackbox.smbclient_ntlm.plain will fail in test environment that doesn't support SMB1 so move to nt4_dc_smb1 This test only fails with options that require it to communicate over SMB1, there are sibling tests that test against >= SMB2 so also we remove the skip_smb1_fail entry as this test doen't need porting (for this env) Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 6d78f565182..0cda1f9fcf1 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -14,7 +14,6 @@ ^samba3.blackbox.smbclient_ntlm.plain NT1\(ad_member\) ^samba3.blackbox.smbclient_ntlm.plain NT1\(fl2000dc\) ^samba3.blackbox.smbclient_ntlm.plain.NT1\(maptoguest\) -^samba3.blackbox.smbclient_ntlm.plain NT1\(nt4_dc\) ^samba3.blackbox.smbclient_ntlm.plain NT1\(nt4_member\) ^samba3.blackbox.smbclient_s3.NT1.plain.member_creds\(ad_member\) ^samba3.blackbox.smbclient_s3.NT1.plain.member_creds\(nt4_member\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 3896fcbd9cd..bab25f6be72 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -258,7 +258,7 @@ for options in ["", "--option=clientntlmv2auth=no", "--option=clientusespnego=no for env in ["nt4_dc", "nt4_member", "ad_member", "ad_dc", "ad_dc_ntvfs", "s4member", "fl2000dc"]: plantestsuite("samba3.blackbox.smbclient_machine_auth.plain", "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_machine_auth.sh"), '$SERVER', smbclient3, configuration]) smb1_env = env - if smb1_env == "ad_dc": + if smb1_env == "ad_dc" or smb1_env == "nt4_dc": smb1_env = smb1_env + "_smb1_done" plantestsuite("samba3.blackbox.smbclient_ntlm.plain NT1", smb1_env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_ntlm.sh"), '$SERVER', '$DC_USERNAME', '$DC_PASSWORD', "never", smbclient3, "NT1", configuration]) plantestsuite("samba3.blackbox.smbclient_ntlm.plain SMB3", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_ntlm.sh"), '$SERVER', '$DC_USERNAME', '$DC_PASSWORD', "never", smbclient3, "SMB3", configuration])