s3/selftest: Move samba3.smbtorture_s3.crypt.POSIX* to nt4_dc_smb1

The tests menioned below all fail when run against environments that
don't support SMB1 so we move them to nt4_dc_smb1

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

samba3.smbtorture_s3.crypt.POSIX
samba3.smbtorture_s3.crypt.POSIX-ACL-OPLOCK
samba3.smbtorture_s3.crypt.POSIX-ACL-SHAREROOT
samba3.smbtorture_s3.crypt.POSIX-APPEND
samba3.smbtorture_s3.crypt.POSIX-BLOCKING-LOCK
samba3.smbtorture_s3.crypt.POSIX-MKDIR
samba3.smbtorture_s3.crypt.POSIX-OFD-LOCK
samba3.smbtorture_s3.crypt.POSIX-STREAM-DELETE
samba3.smbtorture_s3.crypt.POSIX-SYMLINK-ACL
samba3.smbtorture_s3.crypt.POSIX-SYMLINK-EA
samba3.smbtorture_s3.crypt.WINDOWS-BAD-SYMLINK (this is a posix test)

also remove these entries from skip_smb1_fail

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

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 774236caad195c754c7f589312b6bf94cb8e4c65..80dcacbc7268869bf4b12ad73c19331753cfde98 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -22,17 +22,6 @@
 ^samba3.raw.samba3checkfsp\(simpleserver\)
 ^samba3.raw.samba3closeerr\(simpleserver\)
 ^samba3.raw.samba3hide\(simpleserver\)
-^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\)
-^samba3.smbtorture_s3.crypt.POSIX-BLOCKING-LOCK\(nt4_dc\)
-^samba3.smbtorture_s3.crypt.POSIX-MKDIR\(nt4_dc\)
-^samba3.smbtorture_s3.crypt.POSIX\(nt4_dc\)
-^samba3.smbtorture_s3.crypt.POSIX-OFD-LOCK\(nt4_dc\)
-^samba3.smbtorture_s3.crypt.POSIX-STREAM-DELETE\(nt4_dc\)
-^samba3.smbtorture_s3.crypt.POSIX-SYMLINK-ACL\(nt4_dc\)
-^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.MANGLE-ILLEGAL\(nt4_dc\)
 ^samba3.smbtorture_s3.plain.POSIX-ACL-OPLOCK\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index e7455dc0a06446c96d5672688fea01f443913f97..46a4d078f9404c1936b09b2ac1a8890d1a42fe0a 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -186,7 +186,7 @@ posix_tests = ["POSIX", "POSIX-APPEND", "POSIX-SYMLINK-ACL", "POSIX-SYMLINK-EA",
 
 for t in posix_tests:
     plantestsuite("samba3.smbtorture_s3.plain.%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
-    plantestsuite("samba3.smbtorture_s3.crypt.%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"])
+    plantestsuite("samba3.smbtorture_s3.crypt.%s" % t, "nt4_dc_smb1", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"])
     plantestsuite("samba3.smbtorture_s3.plain.%s" % t, "ad_dc_ntvfs", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
 
 local_tests = [