Always call methods to be mocked externally

not only when running tests

Author: ansd

deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl

@@ -20,10 +20,7 @@
 -type filters() :: [{string(), string()}].
 
 -ifdef(TEST).
- -compile(export_all).
- -define(LIST_NODES, ?MODULE:list_nodes). %% call externally such that meck can mock the function
--else.
- -define(LIST_NODES, list_nodes).
+-compile(export_all).
 -endif.
 
 -define(CONFIG_MODULE, rabbit_peer_discovery_config).
@@ -120,7 +117,8 @@ post_registration() ->
 -spec lock(Node :: node()) -> {ok, {ResourceId :: string(), LockRequesterId :: node()}} | {error, Reason :: string()}.
 
 lock(Node) ->
-  case ?LIST_NODES() of
+  %% call list_nodes/0 externally such that meck can mock the function
+  case ?MODULE:list_nodes() of
     {ok, {[], disc}} ->
           {error, "Cannot lock since no nodes got discovered."};
     {ok, {Nodes, disc}} ->
@@ -147,7 +145,7 @@ lock(Node) ->
 -spec unlock({ResourceId :: string(), LockRequesterId :: node()}) -> ok | {error, Reason :: string()}.
 
 unlock(LockId) ->
-  case ?LIST_NODES() of
+  case ?MODULE:list_nodes() of
     {ok, {Nodes, disc}} ->
       global:del_lock(LockId, Nodes),
       ok;

deps/rabbitmq_peer_discovery_k8s/src/rabbit_peer_discovery_k8s.erl

@@ -19,10 +19,7 @@
          post_registration/0, lock/1, unlock/1, send_event/3, generate_v1_event/7]).
 
 -ifdef(TEST).
- -compile(export_all).
- -define(LIST_NODES1, ?MODULE:list_nodes1). %% call externally such that meck can mock the function
--else.
- -define(LIST_NODES1, list_nodes1).
+-compile(export_all).
 -endif.
 
 %%
@@ -69,7 +66,8 @@ unregister() ->
 -spec lock(Node :: node()) -> {ok, {ResourceId :: string(), LockRequesterId :: node()}} | {error, Reason :: string()}.
 
 lock(Node) ->
-  case ?LIST_NODES1() of
+  %% call list_nodes1/0 externally such that meck can mock the function
+  case ?MODULE:list_nodes1() of
     {ok, Nodes} ->
       case lists:member(Node, Nodes) of
         true ->
@@ -95,7 +93,7 @@ lock(Node) ->
 -spec unlock({ResourceId :: string(), LockRequesterId :: node()}) -> ok | {error, Reason :: string()}.
 
 unlock(LockId) ->
-  case ?LIST_NODES1() of
+  case ?MODULE:list_nodes1() of
     {ok, Nodes} ->
       global:del_lock(LockId, Nodes),
       ok;