diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-03-08 21:01:40 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-03-11 15:43:11 +0100 |
| commit | 9b6b82abfaae479849902ba60c4c54a526840a03 (patch) | |
| tree | 4e96855cb8ab6bea70bca7f46c4ab1fdbd72a618 /erts/emulator/test/exception_SUITE.erl | |
| parent | c062dfc485ad0d51d648701950f77ef8f51d4f35 (diff) | |
| download | otp-9b6b82abfaae479849902ba60c4c54a526840a03.tar.gz otp-9b6b82abfaae479849902ba60c4c54a526840a03.tar.bz2 otp-9b6b82abfaae479849902ba60c4c54a526840a03.zip | |
Eliminate use of test_server:fail/0,1
Diffstat (limited to 'erts/emulator/test/exception_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/exception_SUITE.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/test/exception_SUITE.erl b/erts/emulator/test/exception_SUITE.erl index c2b2c50cd5..0face2dfe8 100644 --- a/erts/emulator/test/exception_SUITE.erl +++ b/erts/emulator/test/exception_SUITE.erl @@ -110,7 +110,7 @@ pending_catched(First, Second, Expected) -> {'EXIT', Reason} -> pending(Reason, bad_guy, [First, Second], Expected); Other -> - test_server:fail({not_exit, Other}) + ct:fail({not_exit, Other}) end. pending_exit_message(Args, Expected) -> @@ -122,9 +122,9 @@ pending_exit_message(Args, Expected) -> {'EXIT', Pid, Reason} -> pending(Reason, bad_guy, Args, Expected); Other -> - test_server:fail({unexpected_message, Other}) + ct:fail({unexpected_message, Other}) after 10000 -> - test_server:fail(timeout) + ct:fail(timeout) end, process_flag(trap_exit, false). @@ -144,7 +144,7 @@ pending({Code,[{?MODULE,Func,Arity,Loc}|_]}, Func, Args, Code) when length(Args) =:= Arity, is_list(Loc) -> ok; pending(Reason, _Function, _Args, _Code) -> - test_server:fail({bad_exit_reason,Reason}). + ct:fail({bad_exit_reason,Reason}). %% Test that doing arithmetics on [] gives a badarith EXIT and not a crash. |