diff options
| author | Siri Hansen <[email protected]> | 2012-11-15 08:51:45 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-11-15 08:51:45 +0100 |
| commit | c8d19718ca8e3c2ccc947f67e4068e752b34f6d3 (patch) | |
| tree | bcfeeec67a9c629670206ba5cfcb474a154bd6b7 | |
| parent | 55c2b0b6d55fe6a011671832b5529cb1c7b636a8 (diff) | |
| parent | 3e52784d3c88050d695da1f2828df36c9a83d148 (diff) | |
| download | otp-c8d19718ca8e3c2ccc947f67e4068e752b34f6d3.tar.gz otp-c8d19718ca8e3c2ccc947f67e4068e752b34f6d3.tar.bz2 otp-c8d19718ca8e3c2ccc947f67e4068e752b34f6d3.zip | |
Merge branch 'siri/test_server/faulty-tag-printout-for-connection-log/OTP-10571' into maint
* siri/test_server/faulty-tag-printout-for-connection-log/OTP-10571:
[test_server] Recognize and ignore info_reports for ct connections
| -rw-r--r-- | lib/common_test/src/ct_conn_log_h.erl | 6 | ||||
| -rw-r--r-- | lib/test_server/src/test_server_h.erl | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl index bf27238121..d7bd18606b 100644 --- a/lib/common_test/src/ct_conn_log_h.erl +++ b/lib/common_test/src/ct_conn_log_h.erl @@ -64,10 +64,16 @@ do_open_files([],Acc) -> handle_event({_Type, GL, _Msg}, State) when node(GL) /= node() -> {ok, State}; handle_event({_Type,_GL,{Pid,{ct_connection,Action,ConnName},Report}},State) -> + %% NOTE: if the format of this event is changed + %% ({ct_connection,Action,ConnName}) then remember to change + %% test_server_h:report_receiver as well!!! Info = conn_info(Pid,#conn_log{name=ConnName,action=Action}), write_report(now(),Info,Report,State), {ok, State}; handle_event({_Type,_GL,{Pid,Info=#conn_log{},Report}},State) -> + %% NOTE: if the format of this event is changed + %% (Info=#conn_log{}) then remember to change + %% test_server_h:report_receiver as well!!! write_report(now(),conn_info(Pid,Info),Report,State), {ok, State}; handle_event({error_report,_,{Pid,_,[{ct_connection,ConnName}|R]}},State) -> diff --git a/lib/test_server/src/test_server_h.erl b/lib/test_server/src/test_server_h.erl index fdeee59326..78daba855d 100644 --- a/lib/test_server/src/test_server_h.erl +++ b/lib/test_server/src/test_server_h.erl @@ -131,6 +131,11 @@ report_receiver(warning_msg, _) -> kernel; report_receiver(warning_report, _) -> kernel; report_receiver(info, _) -> kernel; report_receiver(info_msg, _) -> kernel; +report_receiver(info_report,Tuple) + when is_tuple(Tuple) andalso + (element(1,Tuple)==ct_connection orelse + element(1,Tuple)==conn_log) -> + none; report_receiver(info_report, _) -> kernel; report_receiver(_, _) -> none. |