From: Noel Power Date: Fri, 6 Dec 2019 17:13:27 +0000 (+0000) Subject: selftest: Move samba3.blackbox.shadow_copy2 NT1 to fileserver_smb1 X-Git-Tag: ldb-2.2.0~1098 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=47ad2551b443753e0fc6ef94d1eccbe0812ae532;p=thirdparty%2Fsamba.git selftest: Move samba3.blackbox.shadow_copy2 NT1 to fileserver_smb1 Additionally since we already have a SMB3 version of the test we can remove it from the skip file Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 1d536b240ba..bcb8afbf981 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -66,7 +66,6 @@ ^samba3.base.xcopy\(ad_dc\) ^samba3.base.xcopy\(nt4_dc\) ^samba3.blackbox.net.misc\(nt4_dc:local\) -^samba3.blackbox.shadow_copy2.NT1\(fileserver\) ^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 d7fd54e7f91..da86ab70d66 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -360,7 +360,7 @@ for env in ["fileserver"]: plantestsuite("samba3.blackbox.force_create_mode", env, [os.path.join(samba3srcdir, "script/tests/test_force_create_mode.sh"), '$SERVER', '$DOMAIN', '$USERNAME', '$PASSWORD', '$PREFIX', env, smbclient3]) plantestsuite("samba3.blackbox.dropbox", env, [os.path.join(samba3srcdir, "script/tests/test_dropbox.sh"), '$SERVER', '$DOMAIN', 'gooduser', '$PASSWORD', '$PREFIX', env, smbclient3]) plantestsuite("samba3.blackbox.offline", env, [os.path.join(samba3srcdir, "script/tests/test_offline.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/offline', smbclient3]) - plantestsuite("samba3.blackbox.shadow_copy2.NT1", env, [os.path.join(samba3srcdir, "script/tests/test_shadow_copy.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbclient3, '-m', 'NT1']) + plantestsuite("samba3.blackbox.shadow_copy2.NT1", env + "_smb1_done", [os.path.join(samba3srcdir, "script/tests/test_shadow_copy.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbclient3, '-m', 'NT1']) plantestsuite("samba3.blackbox.shadow_copy2.SMB3", env, [os.path.join(samba3srcdir, "script/tests/test_shadow_copy.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbclient3, '-m', 'SMB3']) plantestsuite("samba3.blackbox.shadow_copy_torture", env, [os.path.join(samba3srcdir, "script/tests/test_shadow_copy_torture.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbtorture4]) plantestsuite("samba3.blackbox.smbclient.forceuser_validusers", env, [os.path.join(samba3srcdir, "script/tests/test_forceuser_validusers.sh"), '$SERVER', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH', smbclient3])