Merge branch 'peppe/common_test/ct_telnet_wait_for_prompt.maint' into maint-17

* peppe/common_test/ct_telnet_wait_for_prompt.maint:
  Introduce wait_for_prompt option

3 files changed, 99 insertions, 18 deletions

diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index d906a267a1..844f53731e 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -486,7 +486,8 @@ expect(Connection,Patterns) ->
 %%%      Opts = [Opt]
 %%%      Opt = {idle_timeout,IdleTimeout} | {total_timeout,TotalTimeout} |
 %%%            repeat | {repeat,N} | sequence | {halt,HaltPatterns} |
-%%%            ignore_prompt | no_prompt_check
+%%%            ignore_prompt | no_prompt_check | wait_for_prompt |
+%%%            {wait_for_prompt,Prompt}
 %%%      IdleTimeout = infinity | integer()
 %%%      TotalTimeout = infinity | integer()
 %%%      N = integer()
@@ -499,9 +500,9 @@ expect(Connection,Patterns) ->
 %%%
 %%% @doc Get data from telnet and wait for the expected pattern.
 %%%
-%%% <p><code>Pattern</code> can be a POSIX regular expression. If more
-%%% than one pattern is given, the function returns when the first
-%%% match is found.</p>
+%%% <p><code>Pattern</code> can be a POSIX regular expression. The function
+%%% returns as soon as a pattern has been successfully matched (at least one,
+%%% in the case of multiple patterns).</p>
 %%%
 %%% <p><code>RxMatch</code> is a list of matched strings. It looks
 %%% like this: <code>[FullMatch, SubMatch1, SubMatch2, ...]</code>
@@ -524,10 +525,13 @@ expect(Connection,Patterns) ->
 %%% milliseconds, <code>{error,timeout}</code> is returned. The default
 %%% value is <code>infinity</code> (i.e. no time limit).</p>
 %%%
-%%% <p>The function will always return when a prompt is found, unless
-%%% any of the <code>ignore_prompt</code> or
-%%% <code>no_prompt_check</code> options are used, in which case it
-%%% will return when a match is found or after a timeout.</p>
+%%% <p>The function will return when a prompt is received, even if no
+%%% pattern has yet been matched. In this event,
+%%% <code>{error,{prompt,Prompt}}</code> is returned.
+%%% However, this behaviour may be modified with the
+%%% <code>ignore_prompt</code> or <code>no_prompt_check</code> option, which
+%%% tells <code>expect</code> to return only when a match is found or after a
+%%% timeout.</p>
 %%%
 %%% <p>If the <code>ignore_prompt</code> option is used,
 %%% <code>ct_telnet</code> will ignore any prompt found. This option
@@ -541,6 +545,13 @@ expect(Connection,Patterns) ->
 %%% is useful if, for instance, the <code>Pattern</code> itself
 %%% matches the prompt.</p>
 %%%
+%%% <p>The <code>wait_for_prompt</code> option forces <code>ct_telnet</code>
+%%% to wait until the prompt string has been received before returning
+%%% (even if a pattern has already been matched). This is equal to calling:
+%%% <code>expect(Conn, Patterns++[{prompt,Prompt}], [sequence|Opts])</code>.
+%%% Note that <code>idle_timeout</code> and <code>total_timeout</code>
+%%% may abort the operation of waiting for prompt.</p>
+%%%
 %%% <p>The <code>repeat</code> option indicates that the pattern(s)
 %%% shall be matched multiple times. If <code>N</code> is given, the
 %%% pattern(s) will be matched <code>N</code> times, and the function
@@ -653,18 +664,21 @@ handle_msg({cmd,Cmd,Opts},State) ->
     start_gen_log(heading(cmd,State#state.name)),
     log(State,cmd,"Cmd: ~p",[Cmd]),
 
+    %% whatever is in the buffer from previous operations
+    %% will be ignored as we go ahead with this telnet cmd
+
     debug_cont_gen_log("Throwing Buffer:",[]),
     debug_log_lines(State#state.buffer),
 
     case {State#state.type,State#state.prompt} of
-	{ts,_} -> 
+	{ts,_} ->
 	    silent_teln_expect(State#state.name,
 			       State#state.teln_pid,
 			       State#state.buffer,
 			       prompt,
 			       State#state.prx,
 			       [{idle_timeout,2000}]);
-	{ip,false} -> 
+	{ip,false} ->
 	    silent_teln_expect(State#state.name,
 			       State#state.teln_pid,
 			       State#state.buffer,
@@ -1029,10 +1043,12 @@ teln_expect(Name,Pid,Data,Pattern0,Prx,Opts) ->
 	end,
 
     PromptCheck = get_prompt_check(Opts),
-    Seq = get_seq(Opts),
-    Pattern = convert_pattern(Pattern0,Seq),
 
-    {IdleTimeout,TotalTimeout} = get_timeouts(Opts),
+    {WaitForPrompt,Pattern1,Opts1} = wait_for_prompt(Pattern0,Opts),
+
+    Seq = get_seq(Opts1),
+    Pattern2 = convert_pattern(Pattern1,Seq),
+    {IdleTimeout,TotalTimeout} = get_timeouts(Opts1),
 
     EO = #eo{teln_pid=Pid,
 	     prx=Prx,
@@ -1042,9 +1058,16 @@ teln_expect(Name,Pid,Data,Pattern0,Prx,Opts) ->
 	     haltpatterns=HaltPatterns,
 	     prompt_check=PromptCheck},
     
-    case get_repeat(Opts) of
+    case get_repeat(Opts1) of
 	false ->
-	    case teln_expect1(Name,Pid,Data,Pattern,[],EO) of
+	    case teln_expect1(Name,Pid,Data,Pattern2,[],EO) of
+		{ok,Matched,Rest} when WaitForPrompt ->
+		    case lists:reverse(Matched) of
+			[{prompt,_},Matched1] ->
+			    {ok,Matched1,Rest};
+			[{prompt,_}|Matched1] ->
+			    {ok,lists:reverse(Matched1),Rest}
+		    end;
 		{ok,Matched,Rest} ->
 		    {ok,Matched,Rest};
 		{halt,Why,Rest} ->
@@ -1054,7 +1077,7 @@ teln_expect(Name,Pid,Data,Pattern0,Prx,Opts) ->
 	    end;
 	N ->
 	    EO1 = EO#eo{repeat=N},
-	    repeat_expect(Name,Pid,Data,Pattern,[],EO1)
+	    repeat_expect(Name,Pid,Data,Pattern2,[],EO1)
     end.
 
 convert_pattern(Pattern,Seq) 
@@ -1118,6 +1141,40 @@ get_ignore_prompt(Opts) ->
 get_prompt_check(Opts) ->
     not lists:member(no_prompt_check,Opts).
 
+wait_for_prompt(Pattern, Opts) ->
+    case lists:member(wait_for_prompt, Opts) of
+	true ->
+	    wait_for_prompt1(prompt, Pattern,
+			     lists:delete(wait_for_prompt,Opts));
+	false ->
+	    case proplists:get_value(wait_for_prompt, Opts) of
+		undefined ->
+		    {false,Pattern,Opts};
+		PromptStr ->
+		    wait_for_prompt1({prompt,PromptStr}, Pattern,
+				     proplists:delete(wait_for_prompt,Opts))
+	    end
+    end.
+
+wait_for_prompt1(Prompt, [Ch|_] = Pattern, Opts) when is_integer(Ch) ->
+    wait_for_prompt2(Prompt, [Pattern], Opts);
+wait_for_prompt1(Prompt, Pattern, Opts) when is_list(Pattern) ->
+    wait_for_prompt2(Prompt, Pattern, Opts);
+wait_for_prompt1(Prompt, Pattern, Opts) ->
+    wait_for_prompt2(Prompt, [Pattern], Opts).
+
+wait_for_prompt2(Prompt, Pattern, Opts) ->
+    Pattern1 = case lists:reverse(Pattern) of
+		   [prompt|_]     -> Pattern;
+		   [{prompt,_}|_] -> Pattern;
+		   _              -> Pattern ++ [Prompt]
+	       end,
+    Opts1 = case lists:member(sequence, Opts) of
+		true ->  Opts;
+		false -> [sequence|Opts]
+	    end,
+    {true,Pattern1,Opts1}.
+
 %% Repeat either single or sequence. All match results are accumulated
 %% and returned when a halt condition is fulllfilled.
 repeat_expect(_Name,_Pid,Rest,_Pattern,Acc,#eo{repeat=0}) ->
@@ -1210,7 +1267,7 @@ get_data1(Pid) ->
 %% 1) Single expect.
 %% First the whole data chunk is searched for a prompt (to avoid doing
 %% a regexp match for the prompt at each line).
-%% If we are searching for anyting else, the datachunk is split into
+%% If we are searching for anything else, the datachunk is split into
 %% lines and each line is matched against each pattern.
 
 %% one_expect: split data chunk at prompts
@@ -1227,7 +1284,7 @@ one_expect(Name,Pid,Data,Pattern,EO) ->
 		    log(name_or_pid(Name,Pid),"PROMPT: ~ts",[PromptType]),
 		    {match,{prompt,PromptType},Rest};
 		[{prompt,_OtherPromptType}] ->
-		    %% Only searching for one specific prompt, not thisone
+		    %% Only searching for one specific prompt, not this one
 		    log_lines(Name,Pid,UptoPrompt),
 		    {nomatch,Rest};
 		_ ->
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 1d3f5918d2..9dc9095f47 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
@@ -40,6 +40,7 @@ all() ->
      expect,
      expect_repeat,
      expect_sequence,
+     expect_wait_until_prompt,
      expect_error_prompt,
      expect_error_timeout1,
      expect_error_timeout2,
@@ -81,6 +82,8 @@ end_per_group(_GroupName, Config) ->
 expect(_) ->
     {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo ayt"),
+    {ok,["ayt"]} = ct_telnet:expect(Handle, "ayt"),
+    ok = ct_telnet:send(Handle, "echo ayt"),
     {ok,["ayt"]} = ct_telnet:expect(Handle, ["ayt"]),
     ok = ct_telnet:close(Handle),
     ok.
@@ -103,6 +106,21 @@ expect_sequence(_) ->
     ok = ct_telnet:close(Handle),
     ok.
 
+%% Check that expect can wait for delayed prompt
+expect_wait_until_prompt(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
+    Timeouts = [{idle_timeout,5000},{total_timeout,7000}],
+
+    ok = ct_telnet:send(Handle, "echo_delayed_prompt 3000 xxx"),
+    {ok,["xxx"]} =
+	ct_telnet:expect(Handle, "xxx",
+			 [wait_for_prompt|Timeouts]),
+    ok = ct_telnet:send(Handle, "echo_delayed_prompt 3000 yyy zzz"),
+    {ok,[["yyy"],["zzz"]]} =
+	ct_telnet:expect(Handle, ["yyy","zzz"],
+			 [{wait_for_prompt,"> "}|Timeouts]),
+    ok.
+
 %% Check that expect returns when a prompt is found, even if pattern
 %% is not matched.
 expect_error_prompt(_) ->
diff --git a/lib/common_test/test/telnet_server.erl b/lib/common_test/test/telnet_server.erl
index 11959c3e12..2db5a9bc44 100644
--- a/lib/common_test/test/telnet_server.erl
+++ b/lib/common_test/test/telnet_server.erl
@@ -242,6 +242,12 @@ do_handle_data("echo_loop " ++ Data,State) ->
     ReturnData = string:join(Lines,"\n"),
     send_loop(list_to_integer(TStr),ReturnData,State),
     {ok,State};
+do_handle_data("echo_delayed_prompt "++Data,State) ->
+    [MsStr|EchoData] = string:tokens(Data, " "),
+    send(string:join(EchoData,"\n"),State),
+    ct:sleep(list_to_integer(MsStr)),
+    send("\r\n> ",State),
+    {ok,State};
 do_handle_data("disconnect_after " ++WaitStr,State) ->
     Wait = list_to_integer(string:strip(WaitStr,right,$\n)),
     dbg("Server will close connection in ~w ms...", [Wait]),