s3/selftest: Move samba3.blackbox.smbclient_auth.plain to _smb1_done

samba3.blackbox.smbclient_auth.plain will fail in test environment
that doesn't support SMB1 so move to directly to test env
nt4_dc_smb1_done as it doesn't require porting.

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 52a6969e01056c8afe6a347202e64bebbcc437f4..025879e8f54c3586c7a94e7c60792c456f86bd75 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -8,8 +8,6 @@
 # c) fix the test
 ^samba3.blackbox.smbclient_auth.plain.--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1\(ad_member\)
 ^samba3.blackbox.smbclient_auth.plain.--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1.member_creds\(ad_member\)
-^samba3.blackbox.smbclient_auth.plain.--option=clientntlmv2auth=no --option=clientlanmanauth=yes --max-protocol=LANMAN2\(nt4_dc\)
-^samba3.blackbox.smbclient_auth.plain.--option=clientntlmv2auth=no --option=clientlanmanauth=yes --option=clientmaxprotocol=NT1\(nt4_dc\)
 ^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\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 97b5e424142431180f09f9a3e0f8cc4ae09ca8b8..3e7800e2842febd977afbcfffa5d3513a89d4d89 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -249,7 +249,10 @@ plantestsuite("samba3.blackbox.smbclient_basic.SMB3_11", "nt4_dc_schannel", [os.
 
 plantestsuite("samba3.blackbox.smbclient_basic", "ad_member", [os.path.join(samba3srcdir, "script/tests/test_smbclient_basic.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient3, configuration])
 for options in ["", "--option=clientntlmv2auth=no", "--option=clientusespnego=no", "--option=clientusespnego=no --option=clientntlmv2auth=no", "--option=clientntlmv2auth=no --option=clientlanmanauth=yes --max-protocol=LANMAN2", "--option=clientntlmv2auth=no --option=clientlanmanauth=yes --option=clientmaxprotocol=NT1"]:
-    env = "nt4_dc"
+    if "NT1" in options or "LANMAN2" in options:
+        env = "nt4_dc_smb1_done"
+    else:
+        env = "nt4_dc"
     plantestsuite("samba3.blackbox.smbclient_auth.plain.%s" % (options), env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient3, configuration, options])
 
 for env in ["nt4_dc", "nt4_member", "ad_member", "ad_dc", "ad_dc_ntvfs", "s4member", "fl2000dc"]: