From: Noel Power <noel.power@suse.com>
Date: Fri, 13 Dec 2019 14:10:50 +0000 (+0000)
Subject: s3/selftest: Move samba3.smbtorture_s3.plain.POSIX* to nt4_dc_smb1
X-Git-Tag: ldb-2.2.0~1033
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2668459b90b884fa94faa6068b034fef225b625a;p=thirdparty%2Fsamba.git

s3/selftest: Move samba3.smbtorture_s3.plain.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.plain.POSIX
    samba3.smbtorture_s3.plain.POSIX-ACL-OPLOCK
    samba3.smbtorture_s3.plain.POSIX-ACL-SHAREROOT
    samba3.smbtorture_s3.plain.POSIX-APPEND
    samba3.smbtorture_s3.plain.POSIX-BLOCKING-LOCK
    samba3.smbtorture_s3.plain.POSIX-MKDIR
    samba3.smbtorture_s3.plain.POSIX-OFD-LOCK
    samba3.smbtorture_s3.plain.POSIX-STREAM-DELETE
    samba3.smbtorture_s3.plain.POSIX-SYMLINK-ACL
    samba3.smbtorture_s3.plain.POSIX-SYMLINK-EA
    samba3.smbtorture_s3.plain.WINDOWS-BAD-SYMLINK (this is a posix
test)

Also remove 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 80dcacbc726..4b4aea98dc0 100644
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -24,18 +24,7 @@
 ^samba3.raw.samba3hide\(simpleserver\)
 ^samba3.smbtorture_s3.hidenewfiles\(simpleserver\)\(simpleserver\)
 ^samba3.smbtorture_s3.plain.MANGLE-ILLEGAL\(nt4_dc\)
-^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\)
-^samba3.smbtorture_s3.plain.POSIX-BLOCKING-LOCK\(nt4_dc\)
-^samba3.smbtorture_s3.plain.POSIX-MKDIR\(nt4_dc\)
-^samba3.smbtorture_s3.plain.POSIX\(nt4_dc\)
-^samba3.smbtorture_s3.plain.POSIX-OFD-LOCK\(nt4_dc\)
-^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.RENAME-ACCESS\(nt4_dc\)
-^samba3.smbtorture_s3.plain.WINDOWS-BAD-SYMLINK\(nt4_dc\)
 ^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 46a4d078f94..4cf4b85840f 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -185,7 +185,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.plain.%s" % t, "nt4_dc_smb1", [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_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"])