From: Noel Power Date: Tue, 3 Mar 2020 17:25:30 +0000 (+0000) Subject: s3/selftest: Move samba3.smbtorture_s3.crypt_server.TORTURE to nt4_dc_smb1 X-Git-Tag: ldb-2.2.0~1035 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a78f7478673c3f33b609b7561d1964e7923159fc;p=thirdparty%2Fsamba.git s3/selftest: Move samba3.smbtorture_s3.crypt_server.TORTURE to nt4_dc_smb1 Test fails to negotiation SMB1 in environments that require SMB1 so move to nt4_dc_smb1 env. entry also removed from skip_smb1_fail Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 7b82e91321d..774236caad1 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -22,7 +22,6 @@ ^samba3.raw.samba3checkfsp\(simpleserver\) ^samba3.raw.samba3closeerr\(simpleserver\) ^samba3.raw.samba3hide\(simpleserver\) -^samba3.smbtorture_s3.crypt_client.TORTURE\(nt4_dc\) ^samba3.smbtorture_s3.crypt.POSIX-ACL-OPLOCK\(nt4_dc\) ^samba3.smbtorture_s3.crypt.POSIX-ACL-SHAREROOT\(nt4_dc\) ^samba3.smbtorture_s3.crypt.POSIX-APPEND\(nt4_dc\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 9c732970d0a..e7455dc0a06 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -111,7 +111,7 @@ for t in fileserver_tests: if t == "TORTURE": # this is a negative test to verify that the server rejects # access without encryption - plantestsuite("samba3.smbtorture_s3.crypt_server.%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmpenc', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) + plantestsuite("samba3.smbtorture_s3.crypt_server.%s" % t, "nt4_dc_smb1", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmpenc', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) if t == "CLI_SPLICE": # We must test this against the SMB1 fallback. plantestsuite("samba3.smbtorture_s3.plain.%s" % t, "fileserver_smb1", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH", "-mNT1"])