From: Noel Power Date: Tue, 3 Mar 2020 17:23:04 +0000 (+0000) Subject: s3/selftest: Move samba3.smbtorture_s3.plain.* tests to fileserver_smb1 X-Git-Tag: ldb-2.2.0~1088 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3ae2dcec1c776477b3d9301d149c2fe27314991;p=thirdparty%2Fsamba.git s3/selftest: Move samba3.smbtorture_s3.plain.* tests to fileserver_smb1 with the exception of tests containing "SMB2", "BAD-NBT-SESSION", "DIR1", "LOCK12", "OPLOCK4" so the following tests have been moved output below from python3 source3/selftest/tests.py | grep samba3.smbtorture_s3.plain | sort -u samba3.smbtorture_s3.plain.ATTR samba3.smbtorture_s3.plain.BROWSE samba3.smbtorture_s3.plain.CASE-INSENSITIVE-CREATE samba3.smbtorture_s3.plain.CHAIN1 samba3.smbtorture_s3.plain.CHAIN2( samba3.smbtorture_s3.plain.CHAIN3 samba3.smbtorture_s3.plain.CHKPATH samba3.smbtorture_s3.plain.CLEANUP1 samba3.smbtorture_s3.plain.CLEANUP2 samba3.smbtorture_s3.plain.CLEANUP4 samba3.smbtorture_s3.plain.CLI_SPLICE samba3.smbtorture_s3.plain.DELETE samba3.smbtorture_s3.plain.DELETE-LN samba3.smbtorture_s3.plain.DELETE-STREAM samba3.smbtorture_s3.plain.DIR-CREATETIME samba3.smbtorture_s3.plain.DIR( samba3.smbtorture_s3.plain.FDPASS samba3.smbtorture_s3.plain.FDSESS samba3.smbtorture_s3.plain.IOCTL samba3.smbtorture_s3.plain.LARGE_READX samba3.smbtorture_s3.plain.LOCK10 samba3.smbtorture_s3.plain.LOCK11 samba3.smbtorture_s3.plain.LOCK13 samba3.smbtorture_s3.plain.LOCK1 samba3.smbtorture_s3.plain.LOCK2 samba3.smbtorture_s3.plain.LOCK3 samba3.smbtorture_s3.plain.LOCK4 samba3.smbtorture_s3.plain.LOCK5 samba3.smbtorture_s3.plain.LOCK6 samba3.smbtorture_s3.plain.LOCK7 samba3.smbtorture_s3.plain.LOCK9A samba3.smbtorture_s3.plain.LOCK9B samba3.smbtorture_s3.plain.NTTRANS-FSCTL samba3.smbtorture_s3.plain.OPEN samba3.smbtorture_s3.plain.OPLOCK1 samba3.smbtorture_s3.plain.OPLOCK2 samba3.smbtorture_s3.plain.OPLOCK5 samba3.smbtorture_s3.plain.OWNER-RIGHTS samba3.smbtorture_s3.plain.PIDHIGH samba3.smbtorture_s3.plain.RENAME samba3.smbtorture_s3.plain.RW1 samba3.smbtorture_s3.plain.RW2 samba3.smbtorture_s3.plain.RW3 samba3.smbtorture_s3.plain.RW-SIGNING samba3.smbtorture_s3.plain.SHORTNAME-TEST samba3.smbtorture_s3.plain.STREAMERROR samba3.smbtorture_s3.plain.TCON2 samba3.smbtorture_s3.plain.TCONDEV samba3.smbtorture_s3.plain.TCON samba3.smbtorture_s3.plain.TRANS2 samba3.smbtorture_s3.plain.UID-REGRESSION-TEST samba3.smbtorture_s3.plain.UNLINK samba3.smbtorture_s3.plain.W2K samba3.smbtorture_s3.plain.WILDDELETE samba3.smbtorture_s3.plain.XCOPY corrosponding entries removed from skip_smb1_fail Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/knownfail b/selftest/knownfail index f186b85aea7..eaf05f3bec4 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -14,7 +14,7 @@ ^samba3.smb2.session enc.reconnect # expected to give CONNECTION_DISCONNECTED, we need to fix the test ^samba3.raw.session enc # expected to give ACCESS_DENIED as SMB1 encryption isn't used ^samba3.smbtorture_s3.crypt_server # expected to give ACCESS_DENIED as SMB1 encryption isn't used -^samba3.smbtorture_s3.*.LOCK12.*\(fileserver\) +^samba3.smbtorture_s3.*.LOCK12.*\(fileserver_smb1\) ^samba3.smbtorture_s3.*.LOCK12.*\(nt4_dc\) ^samba3.nbt.dgram.*netlogon2\(nt4_dc\) ^samba3.*rap.sam.*.useradd # Not provided by Samba 3 diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index e669d3b44b2..c448eaa71ef 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -263,46 +263,7 @@ ^samba3.smbtorture_s3.crypt.POSIX-SYMLINK-EA\(nt4_dc\) ^samba3.smbtorture_s3.crypt.WINDOWS-BAD-SYMLINK\(nt4_dc\) ^samba3.smbtorture_s3.hidenewfiles\(simpleserver\)\(simpleserver\) -^samba3.smbtorture_s3.plain.ATTR\(fileserver\) -^samba3.smbtorture_s3.plain.BROWSE\(fileserver\) -^samba3.smbtorture_s3.plain.CASE-INSENSITIVE-CREATE\(fileserver\) -^samba3.smbtorture_s3.plain.CHAIN1\(fileserver\) -^samba3.smbtorture_s3.plain.CHAIN2\(fileserver\) -^samba3.smbtorture_s3.plain.CHAIN3\(fileserver\) -^samba3.smbtorture_s3.plain.CHKPATH\(fileserver\) -^samba3.smbtorture_s3.plain.CLEANUP1\(fileserver\) -^samba3.smbtorture_s3.plain.CLEANUP2\(fileserver\) -^samba3.smbtorture_s3.plain.CLEANUP4\(fileserver\) -^samba3.smbtorture_s3.plain.CLI_SPLICE\(fileserver\) -^samba3.smbtorture_s3.plain.DELETE\(fileserver\) -^samba3.smbtorture_s3.plain.DELETE-LN\(fileserver\) -^samba3.smbtorture_s3.plain.DELETE-STREAM\(fileserver\) -^samba3.smbtorture_s3.plain.DIR-CREATETIME\(fileserver\) -^samba3.smbtorture_s3.plain.DIR\(fileserver\) -^samba3.smbtorture_s3.plain.FDPASS\(fileserver\) -^samba3.smbtorture_s3.plain.FDSESS\(fileserver\) -^samba3.smbtorture_s3.plain.IOCTL\(fileserver\) -^samba3.smbtorture_s3.plain.LARGE_READX\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK10\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK11\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK13\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK1\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK2\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK3\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK4\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK5\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK6\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK7\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK9A\(fileserver\) -^samba3.smbtorture_s3.plain.LOCK9B\(fileserver\) ^samba3.smbtorture_s3.plain.MANGLE-ILLEGAL\(nt4_dc\) -^samba3.smbtorture_s3.plain.NTTRANS-FSCTL\(fileserver\) -^samba3.smbtorture_s3.plain.OPEN\(fileserver\) -^samba3.smbtorture_s3.plain.OPLOCK1\(fileserver\) -^samba3.smbtorture_s3.plain.OPLOCK2\(fileserver\) -^samba3.smbtorture_s3.plain.OPLOCK5\(fileserver\) -^samba3.smbtorture_s3.plain.OWNER-RIGHTS\(fileserver\) -^samba3.smbtorture_s3.plain.PIDHIGH\(fileserver\) ^samba3.smbtorture_s3.plain.POSIX-ACL-OPLOCK\(nt4_dc\) ^samba3.smbtorture_s3.plain.POSIX-ACL-SHAREROOT\(nt4_dc\) ^samba3.smbtorture_s3.plain.POSIX-APPEND\(nt4_dc\) @@ -313,26 +274,8 @@ ^samba3.smbtorture_s3.plain.POSIX-STREAM-DELETE\(nt4_dc\) ^samba3.smbtorture_s3.plain.POSIX-SYMLINK-ACL\(nt4_dc\) ^samba3.smbtorture_s3.plain.POSIX-SYMLINK-EA\(nt4_dc\) -^samba3.smbtorture_s3.plain.PROPERTIES\(fileserver\) ^samba3.smbtorture_s3.plain.RENAME-ACCESS\(nt4_dc\) -^samba3.smbtorture_s3.plain.RENAME\(fileserver\) -^samba3.smbtorture_s3.plain.RW1\(fileserver\) -^samba3.smbtorture_s3.plain.RW2\(fileserver\) -^samba3.smbtorture_s3.plain.RW3\(fileserver\) -^samba3.smbtorture_s3.plain.RW-SIGNING\(fileserver\) -^samba3.smbtorture_s3.plain.SHORTNAME-TEST\(fileserver\) -^samba3.smbtorture_s3.plain.STREAMERROR\(fileserver\) -^samba3.smbtorture_s3.plain.TCON2\(fileserver\) -^samba3.smbtorture_s3.plain.TCONDEV\(fileserver\) -^samba3.smbtorture_s3.plain.TCON\(fileserver\) -^samba3.smbtorture_s3.plain.TORTURE\(fileserver\) -^samba3.smbtorture_s3.plain.TRANS2\(fileserver\) -^samba3.smbtorture_s3.plain.UID-REGRESSION-TEST\(fileserver\) -^samba3.smbtorture_s3.plain.UNLINK\(fileserver\) -^samba3.smbtorture_s3.plain.W2K\(fileserver\) -^samba3.smbtorture_s3.plain.WILDDELETE\(fileserver\) ^samba3.smbtorture_s3.plain.WINDOWS-BAD-SYMLINK\(nt4_dc\) -^samba3.smbtorture_s3.plain.XCOPY\(fileserver\) ^samba3.smbtorture_s3.vfs_aio_fork\(simpleserver\).RW1\(simpleserver\) ^samba3.smbtorture_s3.vfs_aio_fork\(simpleserver\).RW2\(simpleserver\) ^samba3.smbtorture_s3.vfs_aio_fork\(simpleserver\).RW3\(simpleserver\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 44de417c55f..1eb36c6b4f6 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -78,7 +78,8 @@ plantestsuite("samba3.local_s3", "nt4_dc:local", [os.path.join(samba3srcdir, "sc plantestsuite("samba3.blackbox.registry.upgrade", "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_registry_upgrade.sh"), net, dbwrap_tool]) -tests = ["FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7", +fileserver_tests = [ + "FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7", "LOCK9A", "LOCK9B", "LOCK10", "LOCK11", @@ -101,8 +102,11 @@ tests = ["FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7" "DELETE-STREAM", "BAD-NBT-SESSION"] -for t in tests: - plantestsuite("samba3.smbtorture_s3.plain.%s" % t, "fileserver", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) +for t in fileserver_tests: + fileserver_env = "fileserver_smb1" + if "SMB2" in t: + fileserver_env = "fileserver" + plantestsuite("samba3.smbtorture_s3.plain.%s" % t, fileserver_env, [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) plantestsuite("samba3.smbtorture_s3.crypt_client.%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"]) if t == "TORTURE": # this is a negative test to verify that the server rejects @@ -110,7 +114,7 @@ for t in tests: 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"]) if t == "CLI_SPLICE": # We must test this against the SMB1 fallback. - plantestsuite("samba3.smbtorture_s3.plain.%s" % t, "fileserver", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH", "-mNT1"]) + 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"]) plantestsuite("samba3.smbtorture_s3.plain.%s" % t, "ad_dc_ntvfs", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) t = "TLDAP" @@ -118,7 +122,7 @@ plantestsuite("samba3.smbtorture_s3.plain.%s" % t, "ad_dc", [os.path.join(samba3 t = "OPLOCK5" plantestsuite("samba3.smbtorture_s3.plain.%s" % t, - "fileserver", + "fileserver_smb1", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t,