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 80dcacbc7268869bf4b12ad73c19331753cfde98..4b4aea98dc0b6715d01d6869e78e19bdd124480f 100644 (file)
--- 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 46a4d078f9404c1936b09b2ac1a8890d1a42fe0a..4cf4b85840f531b6053406125ab7ca0ff7cb0cae 100755 (executable)
--- 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"])