From 18ffea5e8950c8f823f6e357521d2871c55708ab Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 13 Dec 2019 11:34:13 +0000 Subject: [PATCH] s3/selftest: Move samba3.blackbox.smbclient_large_file*NT1 to nt4_dc_smb1 Test samba3.blackbox.smbclient_large_file*NT1 will only succeed against test environments that support SMB1 so we move it to nt4_dc_smb1. Additionally remove the entry from the skip_smb1_faill file Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- selftest/skip_smb1_fails | 2 -- source3/selftest/tests.py | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 46d5a56d429..2684cfe05b3 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -11,8 +11,6 @@ ^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\) -^samba3.blackbox.smbclient_large_file -mNT1 -e NTLM\(nt4_dc:local\) -^samba3.blackbox.smbclient_large_file -mNT1 NTLM\(nt4_dc:local\) ^samba3.blackbox.smbclient_ntlm.plain NT1\(ad_member\) ^samba3.blackbox.smbclient_ntlm.plain NT1\(fl2000dc\) ^samba3.blackbox.smbclient_ntlm.plain.NT1\(maptoguest\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 718a804f1c0..23cebcb872d 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -956,7 +956,10 @@ for options in options_list: options_list = ["-mNT1", "-mNT1 -e", "-mSMB3", "-mSMB3 -e"] for options in options_list: - plantestsuite("samba3.blackbox.smbclient_large_file %s NTLM" % options, "nt4_dc:local", + env = "nt4_dc" + if "NT1" in options: + env = "nt4_dc_smb1_done" + plantestsuite("samba3.blackbox.smbclient_large_file %s NTLM" % options, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_large_file.sh"), "none", smbclient3, "$SERVER", "$PREFIX", options, "-U$USERNAME%$PASSWORD " + configuration]) -- 2.47.3