diff options
author | Zandra Hird <[email protected]> | 2016-06-08 14:33:01 +0200 |
---|---|---|
committer | Zandra Hird <[email protected]> | 2016-06-08 14:33:01 +0200 |
commit | ce33a24033cc8c4cea735b5f2898708ce34f546d (patch) | |
tree | cf3458a16165ddf3b5089fae0d087caf4cd4fc7d /lib/common_test/src/test_server_gl.erl | |
parent | b6883e187a88b539fdee3fd6acb7a2554edcd196 (diff) | |
parent | 4bcb7bc41effe96ff13238891658f68a8874bb98 (diff) | |
download | otp-ce33a24033cc8c4cea735b5f2898708ce34f546d.tar.gz otp-ce33a24033cc8c4cea735b5f2898708ce34f546d.tar.bz2 otp-ce33a24033cc8c4cea735b5f2898708ce34f546d.zip |
Merge branch 'zandra/test_server/unmatched_returns/OTP-13345'
* zandra/test_server/unmatched_returns/OTP-13345:
vts - Fix unmatched_return warnings
test_server_sup - Fix unmatched_return warnings
test_server_node - Fix unmatched_return warnings
test_server_io - Fix unmtached_return warnings
test_server_gl - Fix unmatched_return warnings
test_server_ctrl - Fix unmatched_return warnings
test_server - fix unmatched_return warnings
remove unused purify functions
Diffstat (limited to 'lib/common_test/src/test_server_gl.erl')
-rw-r--r-- | lib/common_test/src/test_server_gl.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/common_test/src/test_server_gl.erl b/lib/common_test/src/test_server_gl.erl index 333c8fc06e..7d6fe64b92 100644 --- a/lib/common_test/src/test_server_gl.erl +++ b/lib/common_test/src/test_server_gl.erl @@ -185,7 +185,7 @@ handle_info({capture,Cap0}, St) -> end, {noreply,St#st{capture=Cap}}; handle_info({io_request,From,ReplyAs,Req}=IoReq, St) -> - try io_req(Req, From, St) of + _ = try io_req(Req, From, St) of passthrough -> group_leader() ! IoReq; {EscapeHtml,Data} -> @@ -197,7 +197,8 @@ handle_info({io_request,From,ReplyAs,Req}=IoReq, St) -> #st{capture=none} -> ok; #st{capture=CapturePid} -> - CapturePid ! {captured,Data} + CapturePid ! {captured,Data}, + ok end, case EscapeHtml andalso St#st.escape_chars of true -> |