aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-12-16 10:03:02 +0100
committerIngela Anderton Andin <[email protected]>2012-01-11 15:04:55 +0100
commit4d24c6be73d8c73cccd4780e819f0a5148b6f717 (patch)
tree0ea228635a6b5c8250f1ffe78b7dbcadd9038bff
parent76738dd0284a823d9c07149180dfc97097df145f (diff)
downloadotp-4d24c6be73d8c73cccd4780e819f0a5148b6f717.tar.gz
otp-4d24c6be73d8c73cccd4780e819f0a5148b6f717.tar.bz2
otp-4d24c6be73d8c73cccd4780e819f0a5148b6f717.zip
Exec test case should ignore stderr messages
-rw-r--r--lib/ssh/test/ssh_test_lib.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 425fae22c1..0e7e49ae8b 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -139,12 +139,18 @@ reply(TestCase, Result) ->
receive_exec_result(Msg) ->
test_server:format("Expect data! ~p", [Msg]),
receive
+ {ssh_cm,_,{data,_,1, Data}} ->
+ test_server:format("StdErr: ~p~n", [Data]),
+ receive_exec_result(Msg);
Msg ->
test_server:format("1: Collected data ~p", [Msg]),
expected;
Other ->
+ test_server:format("Other ~p", [Other]),
{unexpected_msg, Other}
end.
+
+
receive_exec_end(ConnectionRef, ChannelId) ->
Eof = {ssh_cm, ConnectionRef, {eof, ChannelId}},
ExitStatus = {ssh_cm, ConnectionRef, {exit_status, ChannelId, 0}},