From 5cb2cf1f2c9e03e383f16ea0a93a6ccb36a238bc Mon Sep 17 00:00:00 2001 From: Janusz Jakubiec Date: Fri, 8 Nov 2024 11:14:33 +0100 Subject: [PATCH 1/2] Reducing number of cockroachdb workers in worker_pool to 1, to fix flaky tests --- big_tests/test.config | 2 +- big_tests/tests/pubsub_SUITE.erl | 4 ++-- big_tests/tests/rdbms_SUITE.erl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/big_tests/test.config b/big_tests/test.config index 84137c946da..54908859679 100644 --- a/big_tests/test.config +++ b/big_tests/test.config @@ -286,7 +286,7 @@ workers = 10 [outgoing_pools.rdbms.default] scope = \"global\" - workers = 5 + workers = 1 connection.driver = \"cockroachdb\" connection.host = \"localhost\" connection.port = 26257 diff --git a/big_tests/tests/pubsub_SUITE.erl b/big_tests/tests/pubsub_SUITE.erl index 64b89ff768e..160b85a16a2 100644 --- a/big_tests/tests/pubsub_SUITE.erl +++ b/big_tests/tests/pubsub_SUITE.erl @@ -51,14 +51,14 @@ group_is_compatible(_, _) -> true. base_groups() -> [{basic, [parallel], basic_tests()}, {service_config, [parallel], service_config_tests()}, - {node_config, [parallel], node_config_tests()}, + {node_config, [parallel, {repeat_until_any_fail, 100}], node_config_tests()}, {node_affiliations, [parallel], node_affiliations_tests()}, {manage_subscriptions, [parallel], manage_subscriptions_tests()}, {collection, [sequence], collection_tests()}, {collection_config, [parallel], collection_config_tests()}, {debug_calls, [parallel], debug_calls_tests()}, {pubsub_item_publisher_option, [parallel], pubsub_item_publisher_option_tests()}, - {hometree_specific, [sequence], hometree_specific_tests()}, + {hometree_specific, [sequence, {repeat_until_any_fail, 100}], hometree_specific_tests()}, {last_item_cache, [parallel], last_item_cache_tests()}]. basic_tests() -> diff --git a/big_tests/tests/rdbms_SUITE.erl b/big_tests/tests/rdbms_SUITE.erl index 512607f3903..46c83f1033b 100644 --- a/big_tests/tests/rdbms_SUITE.erl +++ b/big_tests/tests/rdbms_SUITE.erl @@ -39,7 +39,7 @@ all() -> groups() -> [ - {global_rdbms_queries, [], rdbms_queries_cases()}, + {global_rdbms_queries, [{repeat_until_any_fail, 100}], rdbms_queries_cases()}, {tagged_rdbms_queries, [], rdbms_queries_cases()} ]. @@ -77,7 +77,7 @@ rdbms_queries_cases() -> insert_batch_with_null_case, test_cast_insert, test_request_insert, - test_wrapped_request, + %test_wrapped_request, test_failed_wrapper, test_request_transaction, test_restart_transaction_with_execute, From 448b601ed0f0757064241d09581289ed9877900c Mon Sep 17 00:00:00 2001 From: Janusz Jakubiec Date: Fri, 8 Nov 2024 12:23:01 +0100 Subject: [PATCH 2/2] Removing repeat_until_any_fail, 100, after tests passed on CI --- big_tests/tests/pubsub_SUITE.erl | 4 ++-- big_tests/tests/rdbms_SUITE.erl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/big_tests/tests/pubsub_SUITE.erl b/big_tests/tests/pubsub_SUITE.erl index 160b85a16a2..64b89ff768e 100644 --- a/big_tests/tests/pubsub_SUITE.erl +++ b/big_tests/tests/pubsub_SUITE.erl @@ -51,14 +51,14 @@ group_is_compatible(_, _) -> true. base_groups() -> [{basic, [parallel], basic_tests()}, {service_config, [parallel], service_config_tests()}, - {node_config, [parallel, {repeat_until_any_fail, 100}], node_config_tests()}, + {node_config, [parallel], node_config_tests()}, {node_affiliations, [parallel], node_affiliations_tests()}, {manage_subscriptions, [parallel], manage_subscriptions_tests()}, {collection, [sequence], collection_tests()}, {collection_config, [parallel], collection_config_tests()}, {debug_calls, [parallel], debug_calls_tests()}, {pubsub_item_publisher_option, [parallel], pubsub_item_publisher_option_tests()}, - {hometree_specific, [sequence, {repeat_until_any_fail, 100}], hometree_specific_tests()}, + {hometree_specific, [sequence], hometree_specific_tests()}, {last_item_cache, [parallel], last_item_cache_tests()}]. basic_tests() -> diff --git a/big_tests/tests/rdbms_SUITE.erl b/big_tests/tests/rdbms_SUITE.erl index 46c83f1033b..512607f3903 100644 --- a/big_tests/tests/rdbms_SUITE.erl +++ b/big_tests/tests/rdbms_SUITE.erl @@ -39,7 +39,7 @@ all() -> groups() -> [ - {global_rdbms_queries, [{repeat_until_any_fail, 100}], rdbms_queries_cases()}, + {global_rdbms_queries, [], rdbms_queries_cases()}, {tagged_rdbms_queries, [], rdbms_queries_cases()} ]. @@ -77,7 +77,7 @@ rdbms_queries_cases() -> insert_batch_with_null_case, test_cast_insert, test_request_insert, - %test_wrapped_request, + test_wrapped_request, test_failed_wrapper, test_request_transaction, test_restart_transaction_with_execute,