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/busy_port_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/busy_port_SUITE.erl')
-rw-r--r-- | erts/emulator/test/busy_port_SUITE.erl | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl index 9bd4f7e136..172936dd82 100644 --- a/erts/emulator/test/busy_port_SUITE.erl +++ b/erts/emulator/test/busy_port_SUITE.erl @@ -131,7 +131,7 @@ message_order(Config) when is_list(Config) -> {Busy, first} -> ok; Other -> - test_server:fail({unexpected_message, Other}) + ct:fail({unexpected_message, Other}) end, ok. @@ -233,13 +233,13 @@ no_trap_exit(Config) when is_list(Config) -> io:format("Process ~w created port ~w", [Pid, Port]), ?line exit(Port, die); Other1 -> - test_server:fail({unexpected_message, Other1}) + ct:fail({unexpected_message, Other1}) end, ?line receive {'EXIT', Pid, die} -> ok; Other2 -> - test_server:fail({unexpected_message, Other2}) + ct:fail({unexpected_message, Other2}) end, ok. @@ -257,13 +257,13 @@ no_trap_exit_unlinked(Config) when is_list(Config) -> io:format("Process ~w created port ~w", [Pid, Port]), ?line exit(Port, die); Other1 -> - test_server:fail({unexpected_message, Other1}) + ct:fail({unexpected_message, Other1}) end, ?line receive {'EXIT', Pid, normal} -> ok; Other2 -> - test_server:fail({unexpected_message, Other2}) + ct:fail({unexpected_message, Other2}) end, ok. @@ -302,13 +302,13 @@ trap_exit(Config) when is_list(Config) -> ?line {status, suspended} = process_info(Pid, status), ?line exit(Port, die); Other1 -> - test_server:fail({unexpected_message, Other1}) + ct:fail({unexpected_message, Other1}) end, ?line receive {Pid, ok} -> ok; Other2 -> - test_server:fail({unexpected_message, Other2}) + ct:fail({unexpected_message, Other2}) end, ok. @@ -379,8 +379,7 @@ hs_test(Config, HardBusy) when is_list(Config) -> case erl_ddll:load_driver(Path, DrvName) of ok -> ok; {error, Error} -> - io:format("~s\n", [erl_ddll:format_error(Error)]), - ?line ?t:fail() + ct:fail(erl_ddll:format_error(Error)) end, ?line Port = open_port({spawn, DrvName}, []), @@ -721,8 +720,7 @@ port_scheduling(Scenario,Validation,Path) -> case erl_ddll:load_driver(Path, DrvName) of ok -> ok; {error, Error} -> - io:format("~s\n", [erl_ddll:format_error(Error)]), - ?line ?t:fail() + ct:fail(erl_ddll:format_error(Error)) end, Data = run_scenario(lists:flatten(Scenario),[{drvname,DrvName}]), @@ -828,7 +826,7 @@ wait_for(Pids) -> {'EXIT', Pid, normal} -> wait_for(lists:delete(Pid, Pids)); Other -> - test_server:fail({bad_exit, Other}) + ct:fail({bad_exit, Other}) end. fun_spawn(Fun) -> @@ -869,8 +867,7 @@ load_busy_driver(Config) when is_list(Config) -> case erl_ddll:load_driver(DataDir, "busy_drv") of ok -> ok; {error, Error} -> - io:format("~s\n", [erl_ddll:format_error(Error)]), - ?line ?t:fail() + ct:fail(erl_ddll:format_error(Error)) end. %%% Interface functions. @@ -881,7 +878,7 @@ start_busy_driver(Config) when is_list(Config) -> {Pid, started} -> ok; Other -> - test_server:fail({unexpected_message, Other}) + ct:fail({unexpected_message, Other}) end. unlock_slave() -> |