s4:torture/smb2: split out smb2.persistent-open-reconnect-contended

This means the rule in selftest/skip actually works.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Jul 29 08:33:12 UTC 2026 on atb-devel-224

diff --git a/selftest/skip b/selftest/skip
index 768eae56e08f08b7b990c55224b5ab7d1fc57db2..4d0f6cb36417f6e30bf1673592e99ba70ea2fa36 100644 (file)
--- a/selftest/skip
+++ b/selftest/skip
@@ -165,4 +165,4 @@ nbt.bench-wins
 ^samba4.smb2.mkdir.*\(ad_dc_ntvfs\)$ # Ignore ad_dc_ntvfs since this is a new test
 ^samba3.blackbox.open-eintr.*
 smb2.durable-v2-regressions # Only used in blackbox tests
 ^samba4.smb2.mkdir.*\(ad_dc_ntvfs\)$ # Ignore ad_dc_ntvfs since this is a new test
 ^samba3.blackbox.open-eintr.*
 smb2.durable-v2-regressions # Only used in blackbox tests

-^samba3.clustered.smb2.persistent-open.reconnect-contended\(clusteredmember\)
+^samba3.clustered.smb2.persistent-open-reconnect-contended\(clusteredmember\)

diff --git a/source4/torture/smb2/durable_v2_open.c b/source4/torture/smb2/durable_v2_open.c
index 1045a6558a1c99965918d4ee8d8be474a18ae6f6..84f7ba22d72c67b56c69b5a984f54825b725b36a 100644 (file)
--- a/source4/torture/smb2/durable_v2_open.c
+++ b/source4/torture/smb2/durable_v2_open.c
@@ -9467,11 +9467,6 @@ struct torture_suite *torture_smb2_persistent_open_init(TALLOC_CTX *ctx)
        torture_suite_add_1smb2_test(suite, "leaselevels_fo", test_persistent_leaselevels_fo);
        torture_suite_add_1smb2_test(suite, "leaselevels_fo_max_rwh", test_persistent_leaselevels_fo_max_rwh);
        torture_suite_add_1smb2_test(suite, "leaselevels_so", test_persistent_leaselevels_so);
        torture_suite_add_1smb2_test(suite, "leaselevels_fo", test_persistent_leaselevels_fo);
        torture_suite_add_1smb2_test(suite, "leaselevels_fo_max_rwh", test_persistent_leaselevels_fo_max_rwh);
        torture_suite_add_1smb2_test(suite, "leaselevels_so", test_persistent_leaselevels_so);

-       torture_suite_add_1smb2_test(suite, "reconnect-contended", test_persistent_reconnect_contended);
-       torture_suite_add_1smb2_test(suite, "reconnect-contended-win-broken", test_persistent_reconnect_contended_win_broken);
-       torture_suite_add_1smb2_test(suite, "reconnect-contended-two", test_persistent_reconnect_contended_two);
-       torture_suite_add_1smb2_test(suite, "reconnect-contended-oplock", test_persistent_reconnect_contended_oplock);
-       torture_suite_add_1smb2_test(suite, "reconnect-contended-replay", test_persistent_reconnect_contended_replay);

        torture_suite_add_1smb2_test(suite, "timeout_5", test_persistent_timeout_5);
        torture_suite_add_1smb2_test(suite, "rename-dir-open-files", test_persistent_rename_dir_open_files);
        torture_suite_add_1smb2_test(suite, "replay-reconnect", test_persistent_replay_reconnect);
        torture_suite_add_1smb2_test(suite, "timeout_5", test_persistent_timeout_5);
        torture_suite_add_1smb2_test(suite, "rename-dir-open-files", test_persistent_rename_dir_open_files);
        torture_suite_add_1smb2_test(suite, "replay-reconnect", test_persistent_replay_reconnect);


@@ -9677,6 +9672,22 @@ struct torture_suite *torture_smb2_persistent_open_failover_init(TALLOC_CTX *ctx
        suite->description = talloc_strdup(suite, "SMB3-Persistent-Open Failover Tests");
 
        torture_suite_add_1smb2_test(suite, "failover-reconnect", test_persistent_failover_reconnect);
        suite->description = talloc_strdup(suite, "SMB3-Persistent-Open Failover Tests");
 
        torture_suite_add_1smb2_test(suite, "failover-reconnect", test_persistent_failover_reconnect);

+
+       return suite;
+}
+
+struct torture_suite *torture_smb2_persistent_reconnect_contended_init(TALLOC_CTX *ctx)
+{
+       struct torture_suite *suite =
+           torture_suite_create(ctx, "persistent-open-reconnect-contended");
+
+       suite->description = talloc_strdup(suite, "SMB2-PERSISTENT-OPEN-RECONNECT-CONTENDED tests");
+
+       torture_suite_add_1smb2_test(suite, "reconnect-contended", test_persistent_reconnect_contended);
+       torture_suite_add_1smb2_test(suite, "reconnect-contended-win-broken", test_persistent_reconnect_contended_win_broken);
+       torture_suite_add_1smb2_test(suite, "reconnect-contended-two", test_persistent_reconnect_contended_two);
+       torture_suite_add_1smb2_test(suite, "reconnect-contended-oplock", test_persistent_reconnect_contended_oplock);
+       torture_suite_add_1smb2_test(suite, "reconnect-contended-replay", test_persistent_reconnect_contended_replay);

        torture_suite_add_1smb2_test(suite, "reconnect-contended-failover", test_persistent_reconnect_contended_failover);
 
        return suite;
        torture_suite_add_1smb2_test(suite, "reconnect-contended-failover", test_persistent_reconnect_contended_failover);
 
        return suite;

diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index d302205b6a2ca4aea63384eeafda11820ec49120..1310e6146fdd2b58dc67384c28d0b3d72fe8246b 100644 (file)
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -177,6 +177,8 @@ NTSTATUS torture_smb2_init(TALLOC_CTX *ctx)
                torture_smb2_persistent_open_init(suite));
        torture_suite_add_suite(suite,
                torture_smb2_persistent_open_failover_init(suite));
                torture_smb2_persistent_open_init(suite));
        torture_suite_add_suite(suite,
                torture_smb2_persistent_open_failover_init(suite));

+       torture_suite_add_suite(suite,
+               torture_smb2_persistent_reconnect_contended_init(suite));

        torture_suite_add_suite(suite, torture_smb2_dir_init(suite));
        torture_suite_add_suite(suite, torture_smb2_lease_init(suite));
        torture_suite_add_suite(suite, torture_smb2_dirlease_init(suite));
        torture_suite_add_suite(suite, torture_smb2_dir_init(suite));
        torture_suite_add_suite(suite, torture_smb2_lease_init(suite));
        torture_suite_add_suite(suite, torture_smb2_dirlease_init(suite));