Skip to content

Commit 128369d

Browse files
committed
Make CI: Don't refresh logs at the end of ct_master run
The ct_run:run_test function already takes care of the node's logs. The ct_master_logs module takes care of ct_master itself.
1 parent 34707c8 commit 128369d

File tree

1 file changed

+1
-31
lines changed

1 file changed

+1
-31
lines changed

deps/rabbitmq_ct_helpers/src/ct_master_fork.erl

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,6 @@ init_master2(Parent,NodeOptsList,LogDirs) ->
535535
Parent ! {self(),Result}.
536536

537537
master_loop(#state{node_ctrl_pids=[],
538-
logdirs=LogDirs,
539538
results=Finished}) ->
540539
Str =
541540
lists:map(fun({Node,Result}) ->
@@ -544,8 +543,7 @@ master_loop(#state{node_ctrl_pids=[],
544543
end,lists:reverse(Finished)),
545544
log(all,"TEST RESULTS","~ts", [Str]),
546545
log(all,"Info","Updating log files",[]),
547-
refresh_logs(LogDirs,[]),
548-
546+
549547
ct_master_event_fork:stop(),
550548
ct_master_logs_fork:stop(),
551549
ok;
@@ -740,34 +738,6 @@ master_progress(NodeCtrlPids,Results) ->
740738
{Node,ongoing}
741739
end,NodeCtrlPids).
742740

743-
%% refresh those dirs where more than one node has written logs
744-
refresh_logs([D|Dirs],Refreshed) ->
745-
case lists:member(D,Dirs) of
746-
true ->
747-
case lists:keymember(D,1,Refreshed) of
748-
true ->
749-
refresh_logs(Dirs,Refreshed);
750-
false ->
751-
{ok,Cwd} = file:get_cwd(),
752-
case catch ct_run:refresh_logs(D, unknown) of
753-
{'EXIT',Reason} ->
754-
ok = file:set_cwd(Cwd),
755-
refresh_logs(Dirs,[{D,{error,Reason}}|Refreshed]);
756-
Result ->
757-
refresh_logs(Dirs,[{D,Result}|Refreshed])
758-
end
759-
end;
760-
false ->
761-
refresh_logs(Dirs,Refreshed)
762-
end;
763-
refresh_logs([],Refreshed) ->
764-
Str =
765-
lists:map(fun({D,Result}) ->
766-
io_lib:format("Refreshing logs in ~tp... ~tp",
767-
[D,Result])
768-
end,Refreshed),
769-
log(all,"Info","~ts", [Str]).
770-
771741
%%%-----------------------------------------------------------------
772742
%%% NODE CONTROLLER, runs and controls tests on a test node.
773743
%%%-----------------------------------------------------------------

0 commit comments

Comments
 (0)