From: Noel Power Date: Fri, 13 Dec 2019 11:57:40 +0000 (+0000) Subject: s3/selftest: Move samba3.blackbox.smbclient_s3.NT1.sign to nt4_dc_smb1 X-Git-Tag: ldb-2.2.0~1050 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=718fea5cd8ce6e8a1de363ccabed26b24a5fbbe3;p=thirdparty%2Fsamba.git s3/selftest: Move samba3.blackbox.smbclient_s3.NT1.sign to nt4_dc_smb1 samba3.blackbox.smbclient_s3.NT1.sign as the name suggests will fail in test envs that do not support SMB1 so move it to a _smb1 environment. Additionally the associated skip_smb1_fails entry is removed as the test doesn't need to be ported Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 0cda1f9fcf1..f47b4273fba 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -19,7 +19,6 @@ ^samba3.blackbox.smbclient_s3.NT1.plain.member_creds\(nt4_member\) ^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\) ^samba3.raw.acls nfs4acl_xattr-nfs-40\(nt4_dc\) ^samba3.raw.acls nfs4acl_xattr-nfs-41\(nt4_dc\) ^samba3.raw.acls nfs4acl_xattr-simple-40\(nt4_dc\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index d78daf9fbc1..e19a47ea95a 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -346,8 +346,9 @@ for env in ["nt4_member", "ad_member"]: plantestsuite("samba3.blackbox.smbclient_s3.NT1.plain.member_creds", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER/$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration, "NT1"]) plantestsuite("samba3.blackbox.smbclient_s3.SMB3.plain.member_creds", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$SERVER', '$SERVER/$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration, "SMB3"]) -env = "nt4_dc" +env = "nt4_dc_smb1_done" plantestsuite("samba3.blackbox.smbclient_s3.NT1.sign", 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", "--signing=required"]) +env = "nt4_dc" plantestsuite("samba3.blackbox.smbclient_s3.SMB3.sign", 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", "--signing=required"]) for env in ["nt4_member", "ad_member"]: