s3/selftest: Move samba3.smbtorture_s3.crypt_client.* to nt4_dc_smb1

Move samba3.smbtorture_s3.crypt_client.* tests which fail against
environments that don't support SMB1.

The following tests have been moved from nt4_dc -> nt4_dc_smb1

samba3.smbtorture_s3.crypt_client.ATTR
samba3.smbtorture_s3.crypt_client.BROWSE
samba3.smbtorture_s3.crypt_client.CASE-INSENSITIVE-CREATE
samba3.smbtorture_s3.crypt_client.CHAIN1
samba3.smbtorture_s3.crypt_client.CHAIN2
samba3.smbtorture_s3.crypt_client.CHAIN3
samba3.smbtorture_s3.crypt_client.CHKPATH
samba3.smbtorture_s3.crypt_client.CLEANUP1
samba3.smbtorture_s3.crypt_client.CLEANUP2
samba3.smbtorture_s3.crypt_client.CLEANUP4
samba3.smbtorture_s3.crypt_client.CLI_SPLICE
samba3.smbtorture_s3.crypt_client.DELETE
samba3.smbtorture_s3.crypt_client.DELETE-LN
samba3.smbtorture_s3.crypt_client.DELETE-STREAM
samba3.smbtorture_s3.crypt_client.DIR
samba3.smbtorture_s3.crypt_client.DIR-CREATETIME
samba3.smbtorture_s3.crypt_client.FDPASS
samba3.smbtorture_s3.crypt_client.FDSESS
samba3.smbtorture_s3.crypt_client.IOCTL
samba3.smbtorture_s3.crypt_client.LARGE_READX
samba3.smbtorture_s3.crypt_client.LOCK1
samba3.smbtorture_s3.crypt_client.LOCK10
samba3.smbtorture_s3.crypt_client.LOCK11
samba3.smbtorture_s3.crypt_client.LOCK13
samba3.smbtorture_s3.crypt_client.LOCK2
samba3.smbtorture_s3.crypt_client.LOCK3
samba3.smbtorture_s3.crypt_client.LOCK4
samba3.smbtorture_s3.crypt_client.LOCK5
samba3.smbtorture_s3.crypt_client.LOCK6
samba3.smbtorture_s3.crypt_client.LOCK7
samba3.smbtorture_s3.crypt_client.LOCK9A
samba3.smbtorture_s3.crypt_client.LOCK9B
samba3.smbtorture_s3.crypt_client.NTTRANS-FSCTL
samba3.smbtorture_s3.crypt_client.OPEN
samba3.smbtorture_s3.crypt_client.OPLOCK1
samba3.smbtorture_s3.crypt_client.OPLOCK2
samba3.smbtorture_s3.crypt_client.OWNER-RIGHTS
samba3.smbtorture_s3.crypt_client.PIDHIGH
samba3.smbtorture_s3.crypt_client.PROPERTIES
samba3.smbtorture_s3.crypt_client.RENAME
samba3.smbtorture_s3.crypt_client.RENAME-ACCESS
samba3.smbtorture_s3.crypt_client.RW1
samba3.smbtorture_s3.crypt_client.RW2
samba3.smbtorture_s3.crypt_client.RW3
samba3.smbtorture_s3.crypt_client.RW-SIGNING
samba3.smbtorture_s3.crypt_client.SHORTNAME-TEST
samba3.smbtorture_s3.crypt_client.STREAMERROR
samba3.smbtorture_s3.crypt_client.TCON
samba3.smbtorture_s3.crypt_client.TCON2
samba3.smbtorture_s3.crypt_client.TCONDEV
samba3.smbtorture_s3.crypt_client.TORTURE
samba3.smbtorture_s3.crypt_client.TRANS2
samba3.smbtorture_s3.crypt_client.UID-REGRESSION-TEST
samba3.smbtorture_s3.crypt_client.UNLINK
samba3.smbtorture_s3.crypt_client.W2K
samba3.smbtorture_s3.crypt_client.WILDDELETE
samba3.smbtorture_s3.crypt_client.XCOPY

and have been removed from skip_smb1_fail

list of tests modified has been verified with

python3 source3/selftest/tests.py | grep "^samba3.smbtorture_s3." | grep nt4_dc_smb1 | cut -f1 -d\( | sort -u

addionally any knownfail entries have been updated as appropriate.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/knownfail b/selftest/knownfail
index 63739e7c271c84ffe4bf44ac263217745f6cf467..77d16e78b3552f0ca319488e2ff728a70b1e7cc9 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -15,7 +15,7 @@
 ^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_smb1\)
-^samba3.smbtorture_s3.*.LOCK12.*\(nt4_dc\)
+^samba3.smbtorture_s3.*.LOCK12.*\(nt4_dc_smb1\)
 ^samba3.nbt.dgram.*netlogon2\(nt4_dc\)
 ^samba3.*rap.sam.*.useradd # Not provided by Samba 3
 ^samba3.*rap.sam.*.userdelete # Not provided by Samba 3

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 09c36abac62c8b64fbc9fc6da4f220501e47bc58..7b82e91321d741e797a4fdb57df127d91d790979 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -22,63 +22,7 @@
 ^samba3.raw.samba3checkfsp\(simpleserver\)
 ^samba3.raw.samba3closeerr\(simpleserver\)
 ^samba3.raw.samba3hide\(simpleserver\)
-^samba3.smbtorture_s3.crypt_client.ATTR\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.BROWSE\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.CASE-INSENSITIVE-CREATE\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.CHAIN1\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.CHAIN2\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.CHAIN3\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.CHKPATH\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.CLEANUP1\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.CLEANUP2\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.CLEANUP4\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.CLI_SPLICE\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.DELETE-LN\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.DELETE\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.DELETE-STREAM\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.DIR-CREATETIME\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.DIR\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.FDPASS\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.FDSESS\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.IOCTL\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LARGE_READX\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK10\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK11\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK13\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK1\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK2\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK3\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK4\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK5\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK6\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK7\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK9A\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.LOCK9B\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.NTTRANS-FSCTL\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.OPEN\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.OPLOCK1\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.OPLOCK2\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.OWNER-RIGHTS\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.PIDHIGH\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.PROPERTIES\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.RENAME-ACCESS\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.RENAME\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.RW1\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.RW2\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.RW3\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.RW-SIGNING\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.SHORTNAME-TEST\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.STREAMERROR\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.TCON2\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.TCONDEV\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.TCON\(nt4_dc\)
 ^samba3.smbtorture_s3.crypt_client.TORTURE\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.TRANS2\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.UID-REGRESSION-TEST\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.UNLINK\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.W2K\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.WILDDELETE\(nt4_dc\)
-^samba3.smbtorture_s3.crypt_client.XCOPY\(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 8b765aec88f19d4de6848d310a985b16205d0567..9c732970d0aec7e7591de237994a6c2fc7cf8d4b 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -107,7 +107,7 @@ for t in fileserver_tests:
     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"])
+    plantestsuite("samba3.smbtorture_s3.crypt_client.%s" % t, "nt4_dc_smb1", [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
         # access without encryption
@@ -137,7 +137,7 @@ plantestsuite("samba3.smbtorture_s3.plain.%s" % t,
 # RENAME-ACCESS needs to run against a special share - acl_xattr_ign_sysacl_windows
 #
 plantestsuite("samba3.smbtorture_s3.plain.%s" % "RENAME-ACCESS", "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), "RENAME-ACCESS", '//$SERVER_IP/acl_xattr_ign_sysacl_windows', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
-plantestsuite("samba3.smbtorture_s3.crypt_client.%s" % "RENAME-ACCESS", "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), "RENAME-ACCESS", '//$SERVER_IP/acl_xattr_ign_sysacl_windows', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"])
+plantestsuite("samba3.smbtorture_s3.crypt_client.%s" % "RENAME-ACCESS", "nt4_dc_smb1", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), "RENAME-ACCESS", '//$SERVER_IP/acl_xattr_ign_sysacl_windows', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"])
 # non-crypt only
 
 tests = ["OPLOCK-CANCEL"]