From: Noel Power Date: Fri, 13 Dec 2019 10:28:40 +0000 (+0000) Subject: s3/selftest: Move samba3.blackbox.smbclient_auth.plain to _smb1_done X-Git-Tag: ldb-2.2.0~1059 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c88b2b1f85087a1dcaede201ed0986df4347a97;p=thirdparty%2Fsamba.git s3/selftest: Move samba3.blackbox.smbclient_auth.plain to _smb1_done samba3.blackbox.smbclient_auth.plain will fail in test environment that doesn't support SMB1 so move to directly to test env nt4_dc_smb1_done as it doesn't require porting. 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 52a6969e010..025879e8f54 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -8,8 +8,6 @@ # c) fix the test ^samba3.blackbox.smbclient_auth.plain.--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1\(ad_member\) ^samba3.blackbox.smbclient_auth.plain.--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1.member_creds\(ad_member\) -^samba3.blackbox.smbclient_auth.plain.--option=clientntlmv2auth=no --option=clientlanmanauth=yes --max-protocol=LANMAN2\(nt4_dc\) -^samba3.blackbox.smbclient_auth.plain.--option=clientntlmv2auth=no --option=clientlanmanauth=yes --option=clientmaxprotocol=NT1\(nt4_dc\) ^samba3.blackbox.smbclient_auth.plain.--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1.member_creds\(nt4_member\) ^samba3.blackbox.smbclient_auth.plain.--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1\(nt4_member\) ^samba3.blackbox.smbclient_basic.NT1\(nt4_dc_schannel\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 97b5e424142..3e7800e2842 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -249,7 +249,10 @@ plantestsuite("samba3.blackbox.smbclient_basic.SMB3_11", "nt4_dc_schannel", [os. plantestsuite("samba3.blackbox.smbclient_basic", "ad_member", [os.path.join(samba3srcdir, "script/tests/test_smbclient_basic.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient3, configuration]) for options in ["", "--option=clientntlmv2auth=no", "--option=clientusespnego=no", "--option=clientusespnego=no --option=clientntlmv2auth=no", "--option=clientntlmv2auth=no --option=clientlanmanauth=yes --max-protocol=LANMAN2", "--option=clientntlmv2auth=no --option=clientlanmanauth=yes --option=clientmaxprotocol=NT1"]: - env = "nt4_dc" + if "NT1" in options or "LANMAN2" in options: + env = "nt4_dc_smb1_done" + else: + env = "nt4_dc" plantestsuite("samba3.blackbox.smbclient_auth.plain.%s" % (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 ["nt4_dc", "nt4_member", "ad_member", "ad_dc", "ad_dc_ntvfs", "s4member", "fl2000dc"]: