selftest: Move samba3.blackbox.net.misc NT1 to ad_dc_smb1 env

Additionally remove this test from the skip file as the file doesn't
need to be ported

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 f9cbee81eb31b47a594eebd16bea9e221653db5e..9047f88bcf5855ac38ee1c55679b1a800c40d237 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -65,7 +65,6 @@
 ^samba3.base.vuid\(nt4_dc\)
 ^samba3.base.xcopy\(ad_dc\)
 ^samba3.base.xcopy\(nt4_dc\)
-^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 6327ede5f3fbce569a86e70bd7ce1d94d2554c82..f7d22f9aa8652fa28ea65ce40898d06f31946f4a 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -424,7 +424,7 @@ 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 NT1", "ad_dc:local",
+plantestsuite("samba3.blackbox.net.misc NT1", "ad_dc_smb1_done:local",
               [os.path.join(samba3srcdir, "script/tests/test_net_misc.sh"),
                scriptdir, "$SMB_CONF_PATH", net, configuration, "NT1"])
 plantestsuite("samba3.blackbox.net.misc SMB3", "ad_dc:local",