s3/selftest: Move samba3.blackbox.smbclient_ntlm.plain to nt4_dc_smb1

samba3.blackbox.smbclient_ntlm.plain will fail in test environment
that doesn't support SMB1 so move to nt4_dc_smb1

This test only fails with options that require it to communicate over
SMB1, there are sibling tests that test against >= SMB2 so also we
remove the skip_smb1_fail entry as this test doen't need porting
(for this env)

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 6d78f56518211497378dc1026f4a4afaa53294e9..0cda1f9fcf19d400b5f312f0283363c639f11426 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -14,7 +14,6 @@
 ^samba3.blackbox.smbclient_ntlm.plain NT1\(ad_member\)
 ^samba3.blackbox.smbclient_ntlm.plain NT1\(fl2000dc\)
 ^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.plain.member_creds\(ad_member\)
 ^samba3.blackbox.smbclient_s3.NT1.plain.member_creds\(nt4_member\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 3896fcbd9cd6721a6994b00b9347a8aaf533a5dc..bab25f6be723affcbea8322c5a78a30bd93183e7 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -258,7 +258,7 @@ for options in ["", "--option=clientntlmv2auth=no", "--option=clientusespnego=no
 for env in ["nt4_dc", "nt4_member", "ad_member", "ad_dc", "ad_dc_ntvfs", "s4member", "fl2000dc"]:
     plantestsuite("samba3.blackbox.smbclient_machine_auth.plain", "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_machine_auth.sh"), '$SERVER', smbclient3, configuration])
     smb1_env = env
-    if smb1_env == "ad_dc":
+    if smb1_env == "ad_dc" or smb1_env == "nt4_dc":
         smb1_env = smb1_env + "_smb1_done"
     plantestsuite("samba3.blackbox.smbclient_ntlm.plain NT1", smb1_env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_ntlm.sh"), '$SERVER', '$DC_USERNAME', '$DC_PASSWORD', "never", smbclient3, "NT1", configuration])
     plantestsuite("samba3.blackbox.smbclient_ntlm.plain SMB3", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_ntlm.sh"), '$SERVER', '$DC_USERNAME', '$DC_PASSWORD', "never", smbclient3, "SMB3", configuration])