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 <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 85127f885222520fed09e7d99af59021a5bc9326..46d5a56d4294e6ab5c321cf8d65b2e84453035f8 100644 (file)
--- 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 9562554b97f2d08a4746f6bf15b3962678b0dddd..718a804f1c0ee017f4e0825aab88efa0447967bc 100755 (executable)
--- 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"]: