WIP

rabbitmq · Oct 2, 2024 · 38275b6 · 38275b6
1 parent 3f9a57e
commit 38275b6
Show file tree

Hide file tree

Showing 3 changed files with 1,004 additions and 2 deletions.
diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile
@@ -239,12 +239,22 @@ define ct_master.erl
 	peer:call(Pid2, persistent_term, put, [rabbit_ct_tcp_port_base, 25000]),
 	peer:call(Pid3, persistent_term, put, [rabbit_ct_tcp_port_base, 27000]),
 	peer:call(Pid4, persistent_term, put, [rabbit_ct_tcp_port_base, 29000]),
-	ct_master:run("$1"),
+	ct_master_fork:run("$1"),
+	Fail1 = peer:call(Pid1, cth_parallel_ct_detect_failure, has_failures, []),
+	Fail2 = peer:call(Pid2, cth_parallel_ct_detect_failure, has_failures, []),
+	Fail3 = peer:call(Pid3, cth_parallel_ct_detect_failure, has_failures, []),
+	Fail4 = peer:call(Pid4, cth_parallel_ct_detect_failure, has_failures, []),
 	peer:stop(Pid4),
 	peer:stop(Pid3),
 	peer:stop(Pid2),
 	peer:stop(Pid1),
-	halt()
+	if
+		Fail1 -> halt(1);
+		Fail2 -> halt(2);
+		Fail3 -> halt(3);
+		Fail4 -> halt(4);
+		true -> halt(0)
+	end
 endef
 
 PARALLEL_CT_SET_1_A = amqp_client unit_cluster_formation_locking_mocks unit_cluster_formation_sort_nodes unit_collections unit_config_value_encryption unit_connection_tracking
@@ -289,6 +299,11 @@ define tpl_parallel_ct_test_spec
 {node, shard3, 'rabbit_shard3@localhost'}.
 {node, shard4, 'rabbit_shard4@localhost'}.
 
+{ct_hooks, shard1, [cth_parallel_ct_detect_failure]}.
+{ct_hooks, shard2, [cth_parallel_ct_detect_failure]}.
+{ct_hooks, shard3, [cth_parallel_ct_detect_failure]}.
+{ct_hooks, shard4, [cth_parallel_ct_detect_failure]}.
+
 {define, 'Set1', [$(call comma_list,$(addsuffix _SUITE,$1))]}.
 {define, 'Set2', [$(call comma_list,$(addsuffix _SUITE,$2))]}.
 {define, 'Set3', [$(call comma_list,$(addsuffix _SUITE,$3))]}.