diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-04-06 16:15:24 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-04-06 16:23:45 +0200 |
| commit | 66668a6504fe3d6ed33ce87b1d4c1a76dae1a987 (patch) | |
| tree | 8fc8b690a661e7709f4be867b536c5137f2457ba /erts/test/ethread_SUITE.erl | |
| parent | f1bd16d883b6236dff83d7784ebd858ef29e2c0c (diff) | |
| download | otp-66668a6504fe3d6ed33ce87b1d4c1a76dae1a987.tar.gz otp-66668a6504fe3d6ed33ce87b1d4c1a76dae1a987.tar.bz2 otp-66668a6504fe3d6ed33ce87b1d4c1a76dae1a987.zip | |
Eliminate use of test_server:fail/0,1
Diffstat (limited to 'erts/test/ethread_SUITE.erl')
| -rw-r--r-- | erts/test/ethread_SUITE.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl index 0cef913986..1c1a2f3836 100644 --- a/erts/test/ethread_SUITE.erl +++ b/erts/test/ethread_SUITE.erl @@ -241,7 +241,7 @@ get_line(Port, noeol, Data) -> {Port, {data, {Flag, NextData}}} -> get_line(Port, Flag, Data ++ NextData); {Port, eof} -> - ?t:fail(port_prog_unexpectedly_closed) + ct:fail(port_prog_unexpectedly_closed) end. read_case_data(Port, TestCase) -> @@ -253,7 +253,7 @@ read_case_data(Port, TestCase) -> {Port, {data, {Flag, [?SKIPPED_MARKER | CommentStart]}}} -> {skipped, get_line(Port, Flag, CommentStart)}; {Port, {data, {Flag, [?FAILED_MARKER | ReasonStart]}}} -> - ?t:fail(get_line(Port, Flag, ReasonStart)); + ct:fail(get_line(Port, Flag, ReasonStart)); {Port, {data, {eol, [?PID_MARKER | PidStr]}}} -> ?t:format("Port program pid: ~s~n", [PidStr]), CaseProc = self(), @@ -267,7 +267,7 @@ read_case_data(Port, TestCase) -> ?t:format("~s~n", [get_line(Port, Flag, LineStart)]), read_case_data(Port, TestCase); {Port, eof} -> - ?t:fail(port_prog_unexpectedly_closed) + ct:fail(port_prog_unexpectedly_closed) end. run_case(Config, Test, TestArgs) -> @@ -284,11 +284,11 @@ run_case(Config, Test, TestArgs, Fun) -> Port when is_port(Port) -> Fun(Port), CaseResult = read_case_data(Port, Test), - receive - {Port, eof} -> - ok - end, + receive + {Port, eof} -> + ok + end, CaseResult; Error -> - ?t:fail({open_port_failed, Error}) + ct:fail({open_port_failed, Error}) end. |