s3/selftest: Move samba3.blackbox.smbclient_ntlm.plain NT1 to _smb1_done

samba3.blackbox.smbclient_ntlm.plain NT1 fails in environments that
don't support SMB2 so we need to move it to the appropriate _smb1
test env and since this test doesn't need to be ported we can actually
move it directly to the _smb1_done env to indicate that.

Also remove the samba3.blackbox.smbclient_ntlm.plain NT1(ad_dc)
entry from the skip file because we have moved this to the ad_dc_smb1
*and* this test is already ported to >=SMB2

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 50b5d29d4d146a52807711773b157b6a3e37a3fd..2313e277ad4b8fa3e7f0891e18f2f43110c03eb9 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -17,7 +17,6 @@
 ^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_dc\)
 ^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 7388155875481025cd67edbc0560d9436a691944..41fe12c8a056939c8e15399faff2da4441083d7b 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -254,7 +254,10 @@ 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])
-    plantestsuite("samba3.blackbox.smbclient_ntlm.plain NT1", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_ntlm.sh"), '$SERVER', '$DC_USERNAME', '$DC_PASSWORD', "never", smbclient3, "NT1", configuration])
+    smb1_env = env
+    if smb1_env == "ad_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])
 
 for options in ["--option=clientntlmv2auth=no", "--option=clientusespnego=no --option=clientntlmv2auth=no", "--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1", ""]: