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

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 46d5a56d4294e6ab5c321cf8d65b2e84453035f8..2684cfe05b3c77ba7856348e6a0ee3aba24e7b35 100644 (file)
--- 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 718a804f1c0ee017f4e0825aab88efa0447967bc..23cebcb872d04a935a66fadcc396ddff06b81c27 100755 (executable)
--- 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])