diff options
| author | Micael Karlberg <[email protected]> | 2019-07-29 18:43:15 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-07-29 18:43:15 +0200 |
| commit | 7669dd6ec1c05ff9a3b46b10141fd235a618460a (patch) | |
| tree | 2d90df547921c3fe7bd222ad408f4a9e272c1019 /lib | |
| parent | 95305983f417cdcd15129d0c5fe786aeb2f9e42a (diff) | |
| parent | e28303402c4ef2fcdc9ee27b3c717af54b3a1330 (diff) | |
| download | otp-7669dd6ec1c05ff9a3b46b10141fd235a618460a.tar.gz otp-7669dd6ec1c05ff9a3b46b10141fd235a618460a.tar.bz2 otp-7669dd6ec1c05ff9a3b46b10141fd235a618460a.zip | |
Merge branch 'bmk/snmp/agent/20190718/fixing_test_exits' into maint
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/snmp/test/snmp_agent_test_lib.erl | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl index 615d6774b9..c0da47dc4c 100644 --- a/lib/snmp/test/snmp_agent_test_lib.erl +++ b/lib/snmp/test/snmp_agent_test_lib.erl @@ -423,7 +423,18 @@ tc_wait(From, Env, M, F, A) -> "~n ~p" "~n", [Res]), From ! {tc_runner_done, self(), Res, get(test_server_loc)}, - exit(Res). + %% The point of this is that in some cases we have seen that the + %% exit signal having been "passed on" to the CT, which consider any + %% exit a fail (even if its {'EXIT', ok}). + %% So, just to be on the safe side, convert an 'ok' to a 'normal'. + case Res of + ok -> + exit(normal); + {ok, _} -> + exit(normal); + _ -> + exit(Res) + end. tc_run(Mod, Func, Args, Opts) -> ?PRINT2("tc_run -> entry with" |