diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2018-12-20 16:31:15 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2019-02-01 11:23:16 +0100 |
| commit | 215953e78009bd555ba0b00f41b10fd0a1311db2 (patch) | |
| tree | 2852e345d0e2b78ac1f6b4432852deb84a870f78 | |
| parent | 7ae54450980497cdcc87939dcd68d212ea6e8dc0 (diff) | |
| download | rabbitmq-server-git-215953e78009bd555ba0b00f41b10fd0a1311db2.tar.gz | |
Use the new try/catch syntax to get the stacktrace in several testsuites
This fixes a warning about `erlang:get_stacktrace()` deprecation by
Erlang 21 compiler.
| -rw-r--r-- | test/backing_queue_SUITE.erl | 4 | ||||
| -rw-r--r-- | test/dynamic_ha_SUITE.erl | 4 | ||||
| -rw-r--r-- | test/mirrored_supervisor_SUITE.erl | 13 |
3 files changed, 12 insertions, 9 deletions
diff --git a/test/backing_queue_SUITE.erl b/test/backing_queue_SUITE.erl index bc9b2c8ced..c3f87cce59 100644 --- a/test/backing_queue_SUITE.erl +++ b/test/backing_queue_SUITE.erl @@ -1417,8 +1417,8 @@ with_fresh_variable_queue(Fun, Mode) -> shutdown, Fun(VQ1, QName)), Me ! Ref catch - Type:Error -> - Me ! {Ref, Type, Error, erlang:get_stacktrace()} + Type:Error:Stacktrace -> + Me ! {Ref, Type, Error, Stacktrace} end end), receive diff --git a/test/dynamic_ha_SUITE.erl b/test/dynamic_ha_SUITE.erl index e41c07a888..6ccf3a75c3 100644 --- a/test/dynamic_ha_SUITE.erl +++ b/test/dynamic_ha_SUITE.erl @@ -614,8 +614,8 @@ get_stacktrace() -> try throw(e) catch - _:e -> - erlang:get_stacktrace() + _:e:Stacktrace -> + Stacktrace end. %%---------------------------------------------------------------------------- diff --git a/test/mirrored_supervisor_SUITE.erl b/test/mirrored_supervisor_SUITE.erl index d3cc080eeb..aa114e0a84 100644 --- a/test/mirrored_supervisor_SUITE.erl +++ b/test/mirrored_supervisor_SUITE.erl @@ -294,14 +294,17 @@ get_group(Group) -> call(Id, Msg) -> call(Id, Msg, 10*1000, 100). -call(Id, Msg, 0, _Decr) -> - exit({timeout_waiting_for_server, {Id, Msg}, erlang:get_stacktrace()}); - call(Id, Msg, MaxDelay, Decr) -> + call(Id, Msg, MaxDelay, Decr, undefined). + +call(Id, Msg, 0, _Decr, Stacktrace) -> + exit({timeout_waiting_for_server, {Id, Msg}, Stacktrace}); + +call(Id, Msg, MaxDelay, Decr, _) -> try gen_server:call(Id, Msg, infinity) - catch exit:_ -> timer:sleep(Decr), - call(Id, Msg, MaxDelay - Decr, Decr) + catch exit:_:Stacktrace -> timer:sleep(Decr), + call(Id, Msg, MaxDelay - Decr, Decr, Stacktrace) end. kill(Pid) -> kill(Pid, []). |