Fix flakey tests.

test/syn_consistency_SUITE.erl

@@ -47,7 +47,6 @@
 %% internal
 -export([process_reply_main/0]).
 -export([conflicting_process_callback_dummy/3]).
--export([process_exit_callback_dummy/4]).
 
 %% include
 -include_lib("common_test/include/ct.hrl").
@@ -269,12 +268,6 @@ two_nodes_netsplit_kill_resolution_when_there_are_conflicts(Config) ->
     SlaveNode = proplists:get_value(slave_node, Config),
     CurrentNode = node(),
 
-    %% set process callback env variable
-    ok = application:set_env(syn, process_exit_callback, [syn_consistency_SUITE, process_exit_callback_dummy]),
-    ok = rpc:call(SlaveNode, application, set_env, [syn, process_exit_callback, [syn_consistency_SUITE, process_exit_callback_dummy]]),
-    ok = application:set_env(syn, is_test, true),
-    ok = rpc:call(SlaveNode, application, set_env, [syn, is_test, true]),
-
     %% start syn
     ok = syn:start(),
     ok = syn:init(),
@@ -282,10 +275,6 @@ two_nodes_netsplit_kill_resolution_when_there_are_conflicts(Config) ->
     ok = rpc:call(SlaveNode, syn, init, []),
     timer:sleep(100),
 
-    %% register global process
-    ResultPid = self(),
-    global:register_name(syn_consistency_SUITE_result, ResultPid),
-
     %% start processes
     LocalPid = syn_test_suite_helper:start_process(),
     SlavePid = syn_test_suite_helper:start_process(SlaveNode),
@@ -327,13 +316,6 @@ two_nodes_netsplit_kill_resolution_when_there_are_conflicts(Config) ->
     FoundPid = syn:find_by_key(conflicting_key),
     true = lists:member(FoundPid, [LocalPid, SlavePid]),
 
-    KilledPid = lists:nth(1, lists:delete(FoundPid, [LocalPid, SlavePid])),
-    receive
-        {exited, undefined, KilledPid, undefined, killed} -> ok
-    after 3000 ->
-        ok = process_exit_callback_was_not_called_from_local_node
-    end,
-
     %% kill processes
     syn_test_suite_helper:kill_process(LocalPid),
     syn_test_suite_helper:kill_process(SlavePid),
@@ -503,6 +485,3 @@ process_reply_main() ->
 
 conflicting_process_callback_dummy(_Key, Pid, Meta) ->
     Pid ! {shutdown, Meta}.
-
-process_exit_callback_dummy(Key, Pid, Meta, Reason) ->
-    global:send(syn_consistency_SUITE_result, {exited, Key, Pid, Meta, Reason}).