Merge branch 'peppe/common_test/ct_telnet_timeout_error' into maint

* peppe/common_test/ct_telnet_timeout_error:
  Make sure total_timeout can get triggered before idle_timeout

OTP-12335

2 files changed, 27 insertions, 2 deletions

diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index babe73e575..4e03bf8630 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -1122,7 +1122,8 @@ teln_expect1(Name,Pid,Data,Pattern,Acc,EO=#eo{idle_timeout=IdleTO,
 	NotFinished ->
 	    %% Get more data
 	    Fun = fun() -> get_data1(EO#eo.teln_pid) end,
-	    case timer:tc(ct_gen_conn, do_within_time, [Fun, IdleTO]) of
+	    BreakAfter = if TotalTO < IdleTO -> TotalTO; true -> IdleTO end,
+	    case timer:tc(ct_gen_conn, do_within_time, [Fun, BreakAfter]) of
 		{_,{error,Reason}} -> 
 		    %% A timeout will occur when the telnet connection
 		    %% is idle for EO#eo.idle_timeout milliseconds.
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 0ddb4e9b00..bd5d76266a 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
@@ -44,6 +44,7 @@ all() ->
      expect_error_timeout1,
      expect_error_timeout2,
      expect_error_timeout3,
+     total_timeout_less_than_idle,
      no_prompt_check,
      no_prompt_check_repeat,
      no_prompt_check_sequence,
@@ -134,9 +135,32 @@ expect_error_timeout2(_) ->
 expect_error_timeout3(_) ->
     {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo_loop 5000 xxx"),
+
+    T0 = now(),
     {error,timeout} = ct_telnet:expect(Handle, ["yyy"],
 				       [{idle_timeout,infinity},
-					{total_timeout,3000}]),
+					{total_timeout,2001}]),
+    Diff = trunc(timer:now_diff(now(),T0)/1000),
+    {_,true} = {Diff, (Diff >= 2000) and (Diff =< 4000)},
+
+    ok = ct_telnet:send(Handle, "echo ayt"),
+    {ok,["ayt"]} = ct_telnet:expect(Handle, ["ayt"]),
+    ok = ct_telnet:close(Handle),
+    ok.
+    
+%% OTP-12335: If total_timeout < idle_timeout, expect will never timeout
+%% until after idle_timeout, which is incorrect.
+total_timeout_less_than_idle(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
+    ok = ct_telnet:send(Handle, "echo_no_prompt xxx"),
+
+    T0 = now(),
+    {error,timeout} = ct_telnet:expect(Handle, ["yyy"],
+				       [{idle_timeout,5000},
+					{total_timeout,2001}]),
+    Diff = trunc(timer:now_diff(now(),T0)/1000),
+    {_,true} = {Diff, (Diff >= 2000) and (Diff =< 4000)},
+
     ok = ct_telnet:send(Handle, "echo ayt"),
     {ok,["ayt"]} = ct_telnet:expect(Handle, ["ayt"]),
     ok = ct_telnet:close(Handle),