Skip to content

Commit

Permalink
cluster_rename_SUITE: Lower the testsuite timeout
Browse files Browse the repository at this point in the history
While here, be more informative when a node rename fails.
  • Loading branch information
dumbbell committed Aug 25, 2016
1 parent d431320 commit 99f7562
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions test/cluster_rename_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ groups() ->
]}
].

suite() ->
[
%% If a test hangs, no need to wait for 30 minutes.
{timetrap, {minutes, 8}}
].

%% -------------------------------------------------------------------
%% Testsuite setup/teardown.
%% -------------------------------------------------------------------
Expand Down Expand Up @@ -245,7 +251,7 @@ rename_node(Config, Nodename, Map) ->
Config1.

rename_node_fail(Config, Nodename, Map) ->
error = do_rename_node(Config, Nodename, Map),
{error, _, _} = do_rename_node(Config, Nodename, Map),
ok.

do_rename_node(Config, Nodename, Map) ->
Expand All @@ -265,8 +271,8 @@ do_rename_node(Config, Nodename, Map) ->
{ok, _} ->
Config1 = update_config_after_rename(Config, Map1),
{ok, Config1};
{error, _, _} ->
error
{error, _, _} = Error ->
Error
end.

update_config_after_rename(Config, [Old, New | Rest]) ->
Expand Down

0 comments on commit 99f7562

Please sign in to comment.