From: Noel Power Date: Fri, 6 Dec 2019 17:27:53 +0000 (+0000) Subject: s3/selftest: Move samba3.blackbox.net.misc to ad_dc X-Git-Tag: ldb-2.2.0~1097 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c86171aa8b0156aea3f6454b3e7199a99d93b346;p=thirdparty%2Fsamba.git 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 Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index bcb8afbf981..f9cbee81eb3 100644 --- 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 da86ab70d66..2af352bab54 100755 --- 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",