CI: consolidate SMB2-FILEID and SMB2-FILEID-UNIQUE torture test suites

We don't need seperate test suites here, all tests are related to
File-Ids.

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

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 71a0143604e46d10edf67d9d01135e6aedf94fd8..70f2531019146833a517f519e98e5cc46d9fcda2 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -1009,8 +1009,6 @@ for t in tests:
         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     elif t == "smb2.fileid":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit_xattr -U$USERNAME%$PASSWORD')
-    elif t == "smb2.fileid_unique":
-        plansmbtorture4testsuite(t, "fileserver", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
     elif t == "smb2.acls_non_canonical":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/acls_non_canonical -U$USERNAME%$PASSWORD')
     elif t == "smb2.async_dosmode":

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 944bf110e0913bdc66848ebe84e2c0038bf7867f..40c507d558425d2e8184b27a98592d7aed5b8135 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -377,7 +377,6 @@ smb2_s3only = [
     "smb2.durable-v2-delay",
     "smb2.aio_delay",
     "smb2.fileid",
-    "smb2.fileid_unique",
     "smb2.timestamps",
     "smb2.async_dosmode",
     "smb2.twrp",

diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index 433fbe085f05b5f268a3ba46464b0fd78ab16492..b85fe2362b9dddd2d67a0aa67c5c1c6489e8b84e 100644 (file)
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -3171,28 +3171,10 @@ struct torture_suite *torture_smb2_fileid_init(TALLOC_CTX *ctx)
 
        torture_suite_add_1smb2_test(suite, "fileid", test_fileid);
        torture_suite_add_1smb2_test(suite, "fileid-dir", test_fileid_dir);
+       torture_suite_add_1smb2_test(suite, "unique", test_fileid_unique);
+       torture_suite_add_1smb2_test(suite, "unique-dir", test_fileid_unique_dir);
 
-       suite->description = talloc_strdup(suite, "SMB2-CREATE tests");
-
-       return suite;
-}
-
-/*
-   Testing for uniqueness of SMB2 File-IDs
-*/
-struct torture_suite *torture_smb2_fileid_unique_init(TALLOC_CTX *ctx)
-{
-       struct torture_suite *suite = torture_suite_create(ctx,
-                                       "fileid_unique");
-
-       torture_suite_add_1smb2_test(suite,
-                                       "fileid_unique",
-                                       test_fileid_unique);
-       torture_suite_add_1smb2_test(suite,
-                                       "fileid_unique-dir",
-                                       test_fileid_unique_dir);
-
-       suite->description = talloc_strdup(suite, "SMB2-FILEID-UNIQUE tests");
+       suite->description = talloc_strdup(suite, "SMB2-FILEID tests");
 
        return suite;
 }

diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index 3c69d8c7fa0b61463dbef0c8006154cd062acf42..e3c05043e84490d0a15a5b206caf74240da55d48 100644 (file)
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -214,7 +214,6 @@ NTSTATUS torture_smb2_init(TALLOC_CTX *ctx)
        torture_suite_add_1smb2_test(suite, "secleak", torture_smb2_sec_leak);
        torture_suite_add_1smb2_test(suite, "session-id", run_sessidtest);
        torture_suite_add_suite(suite, torture_smb2_deny_init(suite));
-       torture_suite_add_suite(suite, torture_smb2_fileid_unique_init(suite));
 
        suite->description = talloc_strdup(suite, "SMB2-specific tests");