From f9b1ef8eff1402b9614f69adfb3b51ebfc00a33f Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 13 Dec 2019 11:28:06 +0000 Subject: [PATCH] s3/selftest: Move samba3.blackbox.smbclient_s3.NT1.plain to nt4_dc_smb1 Test samba3.blackbox.smbclient_s3.NT1.plain as its name suggests requires a test environment that supports SMB1 so we move it to one. Additionally the entry from the skip_smb1_fail file is removed (for this env) as not porting is required. Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- selftest/skip_smb1_fails | 1 - source3/selftest/tests.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 85127f88522..46d5a56d429 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -20,7 +20,6 @@ ^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\) -^samba3.blackbox.smbclient_s3.NT1.plain\(nt4_dc\) ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(ad_member\) ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(nt4_member\) ^samba3.blackbox.smbclient_s3.NT1.sign\(nt4_dc\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 9562554b97f..718a804f1c0 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -337,8 +337,9 @@ plantestsuite("samba3.blackbox.smbclient_ntlm.plain.NT1", env, [os.path.join(sam plantestsuite("samba3.blackbox.smbclient_ntlm.plain.SMB3", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_ntlm.sh"), '$SERVER', '$USERNAME', '$PASSWORD', "baduser", smbclient3, "SMB3", configuration]) # plain -env = "nt4_dc" +env = "nt4_dc_smb1_done" plantestsuite("samba3.blackbox.smbclient_s3.NT1.plain", 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, "NT1"]) +env = "nt4_dc" plantestsuite("samba3.blackbox.smbclient_s3.SMB3.plain", 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, "SMB3"]) for env in ["nt4_member", "ad_member"]: -- 2.47.3