diff options
author | Björn Gustavsson <[email protected]> | 2016-02-25 15:28:25 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2016-03-09 14:02:50 +0100 |
commit | ca290148fbde80f1cda249c1c15562c5bc9aedaa (patch) | |
tree | 904a73d7f61f001c5a3448a14d80a684c10ae61c /lib/kernel/test/erl_boot_server_SUITE.erl | |
parent | 362707ca44fcfb269f9d981dee13233f1aa7cf2d (diff) | |
download | otp-ca290148fbde80f1cda249c1c15562c5bc9aedaa.tar.gz otp-ca290148fbde80f1cda249c1c15562c5bc9aedaa.tar.bz2 otp-ca290148fbde80f1cda249c1c15562c5bc9aedaa.zip |
Eliminate use of test_server:fail/0,1
Diffstat (limited to 'lib/kernel/test/erl_boot_server_SUITE.erl')
-rw-r--r-- | lib/kernel/test/erl_boot_server_SUITE.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/kernel/test/erl_boot_server_SUITE.erl b/lib/kernel/test/erl_boot_server_SUITE.erl index b376b98812..0267420cab 100644 --- a/lib/kernel/test/erl_boot_server_SUITE.erl +++ b/lib/kernel/test/erl_boot_server_SUITE.erl @@ -130,7 +130,7 @@ stop(Config) when is_list(Config) -> [] -> ok; NotKilled -> - test_server:fail({not_killed, NotKilled}) + ct:fail({not_killed, NotKilled}) end, ok. @@ -243,7 +243,7 @@ responses(Config) when is_list(Config) -> receive What -> ?line close_udp(S1), - ?line ?t:fail({"got unexpected response",What}) + ct:fail({"got unexpected response",What}) after 100 -> ok end, @@ -259,7 +259,7 @@ responses(Config) when is_list(Config) -> ?line [_,_,_ | ThisVer] = Rest1 after 2000 -> ?line close_udp(S2), - ?line ?t:fail("no boot server response; same vsn") + ct:fail("no boot server response; same vsn") end, %% Req from a slave with other erlang vsn. @@ -268,7 +268,7 @@ responses(Config) when is_list(Config) -> receive Anything -> ?line close_udp(S3), - ?line ?t:fail({"got unexpected response",Anything}) + ct:fail({"got unexpected response",Anything}) after 100 -> ok end, @@ -295,7 +295,7 @@ responses(Config) when is_list(Config) -> receive Huh -> ?line close_udp(S4), - ?line ?t:fail({"got unexpected response",Huh}) + ct:fail({"got unexpected response",Huh}) after 100 -> ok end @@ -307,7 +307,7 @@ responses(Config) when is_list(Config) -> %% Now wait for any late unexpected messages. receive Whatever -> - ?line ?t:fail({unexpected_message,Whatever}) + ct:fail({unexpected_message,Whatever}) after 4000 -> ?line close_udp(S1), ?line close_udp(S3), @@ -325,7 +325,7 @@ shutdown(Pid) -> after 1000 -> %% The timeout used to be 1 ms, which could be too short time for the %% SMP emulator on a slow computer with one CPU. - test_server:fail(shutdown) + ct:fail(shutdown) end. good_hosts(_Config) -> |