diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-08-25 17:55:03 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-08-25 17:55:03 +0200 |
| commit | 99f75622beaefa7e4acab9f11befef7067237215 (patch) | |
| tree | b50d1419417ed900bcf67c86fbf2a81bbd7a5c18 | |
| parent | d431320559960968eef716f343cc90d9dbe5e4ce (diff) | |
| download | rabbitmq-server-git-99f75622beaefa7e4acab9f11befef7067237215.tar.gz | |
cluster_rename_SUITE: Lower the testsuite timeout
While here, be more informative when a node rename fails.
| -rw-r--r-- | test/cluster_rename_SUITE.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/cluster_rename_SUITE.erl b/test/cluster_rename_SUITE.erl index 8ce29a6695..9521e04eb5 100644 --- a/test/cluster_rename_SUITE.erl +++ b/test/cluster_rename_SUITE.erl @@ -43,6 +43,12 @@ groups() -> ]} ]. +suite() -> + [ + %% If a test hangs, no need to wait for 30 minutes. + {timetrap, {minutes, 8}} + ]. + %% ------------------------------------------------------------------- %% Testsuite setup/teardown. %% ------------------------------------------------------------------- @@ -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) -> @@ -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]) -> |