s3/selftest: Move samba3.blackbox.net.misc to ad_dc

we have an ad_dc_smb1 env and there is not reason why we need
to use nt4_dc for this test. In a later commit we will move the
NT1 test to the ad_dc_smb1 env.

Addionally we change the existing entry in the skip_smb1_fails
skip 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 bcb8afbf981e022b37c546df630058a54fb007e3..f9cbee81eb31b47a594eebd16bea9e221653db5e 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -65,7 +65,7 @@
 ^samba3.base.vuid\(nt4_dc\)
 ^samba3.base.xcopy\(ad_dc\)
 ^samba3.base.xcopy\(nt4_dc\)
-^samba3.blackbox.net.misc\(nt4_dc:local\)
+^samba3.blackbox.net.misc\(ad_dc:local\)
 ^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\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index da86ab70d663f62963742ed6f70554a6d4390a73..2af352bab54eda1f8cb2a95e0712dd3e0ccbb02c 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -424,10 +424,10 @@ for env in ["fileserver:local"]:
     plantestsuite("samba3.blackbox.net_registry_import", env, [os.path.join(samba3srcdir, "script/tests/test_net_registry_import.sh"), '$SERVER', '$LOCAL_PATH', '$USERNAME', '$PASSWORD'])
 
 # TODO encrypted against member, with member creds, and with DC creds
-plantestsuite("samba3.blackbox.net.misc", "nt4_dc:local",
+plantestsuite("samba3.blackbox.net.misc", "ad_dc:local",
               [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"),
                scriptdir, "$SMB_CONF_PATH", net, configuration, "NT1"])
-plantestsuite("samba3.blackbox.net.misc", "nt4_dc:local",
+plantestsuite("samba3.blackbox.net.misc", "ad_dc:local",
               [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"),
                scriptdir, "$SMB_CONF_PATH", net, configuration, "SMB3"])
 plantestsuite("samba3.blackbox.net.local.registry", "nt4_dc:local",