Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Safer CT hook error handling #3133

Merged
merged 1 commit into from
May 27, 2021
Merged

Safer CT hook error handling #3133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions big_tests/src/ct_mongoose_log_hook.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ pre_init_per_testcase(TC,Config,State=#state{}) ->
State3 = ensure_initialized(Config, State2),
State4 = pre_insert_line_numbers_into_report(State3, TC),
test_server:timetrap_cancel(Dog),
{Config, State4 }.
{Config, State4}.

%% @doc Called after each test case.
post_end_per_testcase(TC,_Config,Return,State) ->
Expand Down Expand Up @@ -163,28 +163,28 @@ make_content(CurrentLineNum, Line) ->
<< (list_to_binary(integer_to_list(CurrentLineNum)))/binary, " ", Line/binary>>.

ensure_initialized(Config, State=#state{node=Node, cookie=Cookie, out_file=undefined}) ->
PrivDir = proplists:get_value(priv_dir, Config),
RunDir = path_helper:ct_run_dir(Config),
File = atom_to_list(Node) ++ ".log.html",
%% On disk
OutFile = filename:join(RunDir, File),
%% In browser
UrlFile = ct_logs:uri(filename:join(path_helper:ct_run_dir_in_browser(Config), File)),
case spawn_log_reader(Node, Cookie) of
{ok, Reader} ->
%% self() process is temporary
{ok, Writer} = open_out_file(OutFile),
file:write(Writer, "<pre>"),
CurrentLineNum = read_and_write_lines(Node, Reader, Writer, 0),
ct:pal("issue=\"ct_mongoose_log_hook created log file\", "
"ct_node=~p, reader=~p, reader_node=~p, writer=~p, out_file=~p",
[node(), Reader, node(Reader), Writer, OutFile]),
State#state{reader=Reader, writer=Writer, out_file=OutFile,
current_line_num=CurrentLineNum, url_file=UrlFile};
Reason ->
ct:pal("issue=\"Failed to init ct_mongoose_log_hook\", node=~p, reason=~p",
[Node, Reason]),
State#state{out_file=OutFile}
try
{ok, Reader} = spawn_log_reader(Node, Cookie),
%% self() process is temporary
{ok, Writer} = open_out_file(OutFile),
file:write(Writer, "<pre>"),
CurrentLineNum = read_and_write_lines(Node, Reader, Writer, 0),
ct:pal("issue=\"ct_mongoose_log_hook created log file\", "
"ct_node=~p, reader=~p, reader_node=~p, writer=~p, out_file=~p",
[node(), Reader, node(Reader), Writer, OutFile]),
State#state{reader=Reader, writer=Writer, out_file=OutFile,
current_line_num=CurrentLineNum, url_file=UrlFile}
catch Class:Reason:Stacktrace ->
ct:pal("issue=\"Failed to init ct_mongoose_log_hook\"~n node=~p~n "
"reason=~p~n stacktrace=~p",
[Node, Reason, Stacktrace]),
State
end;
ensure_initialized(_Config, State=#state{}) ->
State.
Expand Down Expand Up @@ -254,12 +254,19 @@ open_out_file(OutFile) ->
%% @doc Open file. The caller process will not be monitored by file_server.
%% So, the file is not closed in case the parent process dies.
open_file_without_linking(Node, File, Opts) when Node =:= node() ->
apply_in_new_process(file, open, [File, Opts]);
Res = apply_in_new_process(file, open, [File, Opts]),
check_result(Node, File, Res);
open_file_without_linking(Node, File, Opts) ->
%% Regular rpc:call/4 spawns a temporary process which
%% cause file process termination.
%% `block_call' is executed inside a long-living process.
rpc:block_call(Node, file, open, [File, Opts], 5000).
Res = rpc:block_call(Node, file, open, [File, Opts], 5000),
check_result(Node, File, Res).

check_result(Node, File, {ok, _} = Res) ->
Res;
check_result(Node, File, Res) ->
ct:fail({open_file_failed, Node, File, Res}).

%% Spawns a long living process and executes function
apply_in_new_process(M, F, A) ->
Expand Down
7 changes: 5 additions & 2 deletions big_tests/src/ct_tty_hook.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,12 @@ post_end_per_group(Group,_Config,Return,State) ->
{Return, State}.

%% @doc Called before each test case.
pre_init_per_testcase(TC,Config,State) ->
pre_init_per_testcase(TC,Config,State = #state{suite_total = Total})
when is_integer(Total) ->
print_case_enter(TC, State, "Starting"),
{Config, State#state{ ts = os:timestamp(), total = State#state.suite_total + 1 } }.
{Config, State#state{ ts = os:timestamp(), total = Total + 1 } };
pre_init_per_testcase(TC, Config, State) ->
{Config, State}.

%% @doc Called after each test case.
post_end_per_testcase(TC, _Config, Return, State) ->
Expand Down