1 files changed, 62 insertions, 3 deletions

diff --git a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
index 8d142e85a8..0ee0525216 100644
--- a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
+++ b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
@@ -20,7 +20,9 @@ all() ->
      expect_repeat,
      expect_sequence,
      expect_error_prompt,
-     expect_error_timeout,
+     expect_error_timeout1,
+     expect_error_timeout2,
+     expect_error_timeout3,
      no_prompt_check,
      no_prompt_check_repeat,
      no_prompt_check_sequence,
@@ -28,7 +30,9 @@ all() ->
      ignore_prompt,
      ignore_prompt_repeat,
      ignore_prompt_sequence,
-     ignore_prompt_timeout].
+     ignore_prompt_timeout,
+     server_speaks,
+     server_disconnects].
 
 groups() ->
     [].
@@ -85,13 +89,34 @@ expect_error_prompt(_) ->
 %% Check that expect returns after idle timeout, and even if the
 %% expected pattern is received - as long as not newline or prompt is
 %% received it will not match.
-expect_error_timeout(_) ->
+expect_error_timeout1(_) ->
     {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo_no_prompt xxx"),
     {error,timeout} = ct_telnet:expect(Handle, ["xxx"], [{timeout,1000}]),
     ok = ct_telnet:close(Handle),
     ok.
 
+expect_error_timeout2(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
+    ok = ct_telnet:send(Handle, "echo_no_prompt xxx"),
+    {error,timeout} = ct_telnet:expect(Handle, ["xxx"], [{idle_timeout,1000},
+							 {total_timeout,infinity}]),
+    ok = ct_telnet:close(Handle),
+    ok.
+
+%% Check that if server loops and pattern not matching, the operation
+%% can be aborted
+expect_error_timeout3(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
+    ok = ct_telnet:send(Handle, "echo_loop 5000 xxx"),
+    {error,timeout} = ct_telnet:expect(Handle, ["yyy"],
+				       [{idle_timeout,infinity},
+					{total_timeout,3000}]),
+    ok = ct_telnet:send(Handle, "echo ayt"),
+    {ok,["ayt"]} = ct_telnet:expect(Handle, ["ayt"]),
+    ok = ct_telnet:close(Handle),
+    ok.
+
 %% expect with ignore_prompt option should not return even if a prompt
 %% is found. The pattern after the prompt (here "> ") can be matched.
 ignore_prompt(_) ->
@@ -188,3 +213,37 @@ no_prompt_check_timeout(_) ->
 							 {timeout,1000}]),
     ok = ct_telnet:close(Handle),
     ok.
+
+%% The server says things. Manually check that it gets printed correctly
+%% in the general IO log.
+server_speaks(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
+    ok = ct_telnet:send(Handle, "echo_no_prompt This is the first message\r\n"),
+    ok = ct_telnet:send(Handle, "echo_no_prompt This is the second message\r\n"),
+    %% let ct_telnet_client get an idle timeout
+    timer:sleep(15000),
+    ok = ct_telnet:send(Handle, "echo_no_prompt This is the third message\r\n"),
+    {ok,_} = ct_telnet:expect(Handle, ["the"], [no_prompt_check]),
+    {error,timeout} = ct_telnet:expect(Handle, ["the"], [no_prompt_check,
+							 {timeout,1000}]),
+    ok = ct_telnet:send(Handle, "echo_no_prompt This is the fourth message\r\n"),
+    %% give the server time to respond
+    timer:sleep(2000),
+    %% closing the connection should print last message in log
+    ok = ct_telnet:close(Handle),
+    ok.  
+
+%% Let the server close the connection. Make sure buffered data gets printed
+%% to the general IO log.
+server_disconnects(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
+    ok = ct_telnet:send(Handle, "disconnect_after 1500"),
+    %% wait until the get_data operation (triggered by send/2) times out
+    %% before sending the msg
+    timer:sleep(500),
+    ok = ct_telnet:send(Handle, "echo_no_prompt This is the message\r\n"),
+    %% when the server closes the connection, the last message should be
+    %% printed in the log
+    timer:sleep(3000),
+    _ = ct_telnet:close(Handle),
+    ok.