CI: remove shares referencing removed functionality

The whole "smbd:force sync [user|root] [path|chdir] safe threadpool" stuff was
removed long ago by 29dd6f3e59055a17fa3d6a63619773f940e63374.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14957

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 8c271d80ff060efa60d6e1974a86168594752c29..5e7f04f497d582b8998a9d67a0f5ea6d046791e4 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1642,32 +1642,6 @@ sub setup_simpleserver
        aio_pthread:aio open = yes
        smbd async dosmode = yes
 
-[vfs_aio_pthread_async_dosmode_force_sync1]
-       path = $prefix_abs/share
-       read only = no
-       vfs objects = aio_pthread
-       store dos attributes = yes
-       aio_pthread:aio open = yes
-       smbd async dosmode = yes
-       # This simulates non linux systems
-       smbd:force sync user path safe threadpool = yes
-       smbd:force sync user chdir safe threadpool = yes
-       smbd:force sync root path safe threadpool = yes
-       smbd:force sync root chdir safe threadpool = yes
-
-[vfs_aio_pthread_async_dosmode_force_sync2]
-       path = $prefix_abs/share
-       read only = no
-       vfs objects = aio_pthread xattr_tdb
-       store dos attributes = yes
-       aio_pthread:aio open = yes
-       smbd async dosmode = yes
-       # This simulates non linux systems
-       smbd:force sync user path safe threadpool = yes
-       smbd:force sync user chdir safe threadpool = yes
-       smbd:force sync root path safe threadpool = yes
-       smbd:force sync root chdir safe threadpool = yes
-
 [vfs_aio_fork]
        path = $prefix_abs/share
         vfs objects = aio_fork
@@ -2042,32 +2016,6 @@ sub setup_fileserver_smb1
        aio_pthread:aio open = yes
        smbd async dosmode = yes
 
-[vfs_aio_pthread_async_dosmode_force_sync1]
-       path = $prefix_abs/share
-       read only = no
-       vfs objects = aio_pthread
-       store dos attributes = yes
-       aio_pthread:aio open = yes
-       smbd async dosmode = yes
-       # This simulates non linux systems
-       smbd:force sync user path safe threadpool = yes
-       smbd:force sync user chdir safe threadpool = yes
-       smbd:force sync root path safe threadpool = yes
-       smbd:force sync root chdir safe threadpool = yes
-
-[vfs_aio_pthread_async_dosmode_force_sync2]
-       path = $prefix_abs/share
-       read only = no
-       vfs objects = aio_pthread xattr_tdb
-       store dos attributes = yes
-       aio_pthread:aio open = yes
-       smbd async dosmode = yes
-       # This simulates non linux systems
-       smbd:force sync user path safe threadpool = yes
-       smbd:force sync user chdir safe threadpool = yes
-       smbd:force sync root path safe threadpool = yes
-       smbd:force sync root chdir safe threadpool = yes
-
 [vfs_aio_fork]
        path = $prefix_abs/share
         vfs objects = aio_fork

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 3acd5e5180ae13bcea4d3617a6e6f2f6c94a2eb2..d73658da3eb72a9b18e3287bafea3852008d01b9 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -275,9 +275,7 @@ plantestsuite("samba3.smbtorture_s3.plain.%s" % "SMB2-DEL-ON-CLOSE-NONEMPTY",
 
 shares = [
     "vfs_aio_pthread_async_dosmode_default1",
-    "vfs_aio_pthread_async_dosmode_default2",
-    "vfs_aio_pthread_async_dosmode_force_sync1",
-    "vfs_aio_pthread_async_dosmode_force_sync2"
+    "vfs_aio_pthread_async_dosmode_default2"
 ]
 for s in shares:
     plantestsuite("samba3.smbtorture_s3.%s(simpleserver).SMB2-BASIC" % s, "simpleserver", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), 'SMB2-BASIC', '//$SERVER_IP/' + s, '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])