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/inet_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/inet_SUITE.erl')
-rw-r--r-- | lib/kernel/test/inet_SUITE.erl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl index 5834c990d5..5b238095b4 100644 --- a/lib/kernel/test/inet_SUITE.erl +++ b/lib/kernel/test/inet_SUITE.erl @@ -284,7 +284,7 @@ check_elem(Val, [Val|_], _) -> ok; check_elem(Val, [_|Tests], Tests0) -> check_elem(Val, Tests, Tests0); check_elem(Val, [], Tests0) -> - ?t:fail({no_match,Val,Tests0}). + ct:fail({no_match,Val,Tests0}). t_getaddr() -> required(v4). @@ -359,7 +359,7 @@ ipv4_to_ipv6(Config) when is_list(Config) -> io:format("IPv6->IPv4: eafnosupport~n"), E; Other -> - ?line ?t:fail({ipv4_to_ipv6_lookup_failed,Other}) + ct:fail({ipv4_to_ipv6_lookup_failed,Other}) end, ?line case {IP4to6Res,inet:gethostbyname(IPStr, inet6)} of {true,{ok,HEnt}} -> @@ -899,7 +899,7 @@ control_loop_1(Op, Interval, Tag, Lookupers) -> _ -> ?line io:format("Lookuper ~p died: ~p", [Pid,Reason]), - ?line test_server:fail("Lookuper died") + ct:fail("Lookuper died") end after Interval -> ?line if Op =/= undefined -> @@ -971,7 +971,7 @@ do_getif(Osname) -> end, [], Interfaces)), ?line io:format("HWAs = ~p~n", [HWAs]), ?line (Osname =/= sunos) - andalso ((length(HWAs) > 0) orelse (?t:fail(no_HWAs))), + andalso ((length(HWAs) > 0) orelse (ct:fail(no_HWAs))), ?line Addresses = lists:sort( lists:foldl( @@ -1022,7 +1022,7 @@ getifaddrs(Config) when is_list (Config) -> lists:keymember(hwaddr, 1, Opts)]} of {{unix,sunos},[]} -> ok; {OT,[]} -> - ?t:fail({should_have_hwaddr,OT}); + ct:fail({should_have_hwaddr,OT}); _ -> ok end, ?line Addrs = @@ -1073,7 +1073,7 @@ check_ifopts([], #ifopts{name=If,flags=Flags,addrs=Raddrs}=Ifopts) -> %% See how we did... if is_list(Flags) -> ok; true -> - ?t:fail({flags_undefined,If}) + ct:fail({flags_undefined,If}) end, case lists:member(broadcast, Flags) of true -> @@ -1081,12 +1081,12 @@ check_ifopts([], #ifopts{name=If,flags=Flags,addrs=Raddrs}=Ifopts) -> {_,_,_} -> A; {T,_} when tuple_size(T) =:= 8 -> A; _ -> - ?t:fail({broaddr_missing,If,A}) + ct:fail({broaddr_missing,If,A}) end || A <- Addrs]; false -> [case A of {_,_} -> A; _ -> - ?t:fail({should_have_netmask,If,A}) + ct:fail({should_have_netmask,If,A}) end || A <- Addrs] end, R; @@ -1097,7 +1097,7 @@ check_ifopts([{flags,Fs}|Opts], #ifopts{flags=Flags}=Ifopts) -> Flags -> check_ifopts(Opts, Ifopts#ifopts{}); _ -> - ?t:fail({multiple_flags,Fs,Ifopts}) + ct:fail({multiple_flags,Fs,Ifopts}) end; check_ifopts( [{addr,Addr},{netmask,Netmask},{broadaddr,Broadaddr}|Opts], @@ -1113,7 +1113,7 @@ check_ifopts([{hwaddr,Hwaddr}|Opts], #ifopts{hwaddr=undefined}=Ifopts) when is_list(Hwaddr) -> check_ifopts(Opts, Ifopts#ifopts{hwaddr=Hwaddr}); check_ifopts([{hwaddr,HwAddr}|_], #ifopts{}=Ifopts) -> - ?t:fail({multiple_hwaddrs,HwAddr,Ifopts}). + ct:fail({multiple_hwaddrs,HwAddr,Ifopts}). %% Works just like lists:member/2, except that any {127,_,_,_} tuple %% matches any other {127,_,_,_}. We do this to handle Linux systems |