From: Noel Power <noel.power@suse.com>
Date: Fri, 13 Dec 2019 10:49:51 +0000 (+0000)
Subject: s3/selftest: Move samba3.blackbox.smbclient_s3.NT1.crypt to nt4_dc_smb1
X-Git-Tag: ldb-2.2.0~1057
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=691ef77fe8824fd620d04629ff0b3589dac0c454;p=thirdparty%2Fsamba.git

s3/selftest: Move samba3.blackbox.smbclient_s3.NT1.crypt to nt4_dc_smb1

now that a specific SMB1 enabled env is available lets move this
test to nt4_dc_smb1 env. Additionally the entry is removed from
skip_smb1_fails as no porting is required

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 025879e8f54..85127f88522 100644
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -18,7 +18,6 @@
 ^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.crypt\(nt4_dc\)
 ^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\)
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index ef3459b381a..e2c5425c0d4 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -353,9 +353,10 @@ for env in ["nt4_member", "ad_member"]:
     plantestsuite("samba3.blackbox.smbclient_s3.NT1.sign.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", "--signing=required"])
     plantestsuite("samba3.blackbox.smbclient_s3.SMB3.sign.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", "--signing=required"])
 
-env = "nt4_dc"
+env = "nt4_dc_smb1_done"
 # encrypted
 plantestsuite("samba3.blackbox.smbclient_s3.NT1.crypt", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration, "NT1", "-e"])
+env = "nt4_dc"
 plantestsuite("samba3.blackbox.smbclient_s3.SMB3.crypt", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_s3.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$USERID', '$LOCAL_PATH', '$PREFIX', smbclient3, wbinfo, net, configuration, "SMB3", "-e"])
 
 for env in ["fileserver"]: