From e0ba268004bfce7a624b23181bffbc51ce2b48ba Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 31 Oct 2024 08:08:08 +0100
Subject: [PATCH] [diameter|test] Timeout tweaking

---
 lib/diameter/test/diameter_config_SUITE.erl | 26 +++++++++++++++++----
 lib/diameter/test/diameter_util.erl         |  2 +-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl
index 3fadde1f437..8c9bd92d4a1 100644
--- a/lib/diameter/test/diameter_config_SUITE.erl
+++ b/lib/diameter/test/diameter_config_SUITE.erl
@@ -232,30 +232,48 @@ end_per_suite(Config) ->
     ?DUTIL:end_per_suite(Config).
 
 
-start_service(_Config) ->
+start_service(Config) ->
     ?CL("~w -> entry", [?FUNCTION_NAME]),
+    put(dia_factor, dia_factor(Config)),
     Res = run([?FUNCTION_NAME]),
     ?CL("~w -> done when"
         "~n   Res: ~p", [?FUNCTION_NAME, Res]),
     Res.
 
-add_transport(_Config) ->
+add_transport(Config) ->
     ?CL("~w -> entry", [?FUNCTION_NAME]),
+    put(dia_factor, dia_factor(Config)),
     Res = run([?FUNCTION_NAME]),
     ?CL("~w -> done when"
         "~n   Res: ~p", [?FUNCTION_NAME, Res]),
     Res.
 
+dia_factor(Config) ->
+    {value, {?FUNCTION_NAME, DiaFactor}} =
+        lists:keysearch(?FUNCTION_NAME, 1, Config),
+    DiaFactor.
 
 %% ===========================================================================
 
+%% Factor: >= 1
+to(Base, Factor) when (Factor >= 0) ->
+    round(Base * (((Factor-1) + 10) / 10)).
+
 run() ->
     run(all()).
 
 run(List)
   when is_list(List) ->
+    BaseTo = 5000,
+    To = case get(dia_factor) of
+             undefined ->
+                 BaseTo;
+             DF when is_integer(DF) ->
+                 to(BaseTo, DF)
+         end,
+    ?CL("~w -> timeout calculated to ~w", [?FUNCTION_NAME, To]),
     try
-        ?RUN([[[fun run/1, {F, 5000}] || F <- List]])
+        ?RUN([[[fun run/1, {F, To}] || F <- List]])
     after
         dbg:stop(),
         diameter:stop()
@@ -265,7 +283,7 @@ run({F, Tmo}) ->
     ?CL("~w -> entry - try start diameter", [?FUNCTION_NAME]),
     ok = diameter:start(),
     try
-        ?CL("~w -> try - start diameter", [?FUNCTION_NAME]),
+        ?CL("~w -> try - run ~p", [?FUNCTION_NAME, F]),
         ?RUN([{[fun run/1, F], Tmo}])
     after
         ?CL("~w -> after - try stop diameter", [?FUNCTION_NAME]),
diff --git a/lib/diameter/test/diameter_util.erl b/lib/diameter/test/diameter_util.erl
index 64456c89640..f094d683d22 100644
--- a/lib/diameter/test/diameter_util.erl
+++ b/lib/diameter/test/diameter_util.erl
@@ -481,7 +481,7 @@ eval({F, Tmo})
     ?UL("eval(~p) -> entry", [Tmo]),
     %% Since this function is used for all kinds of functions,
     %% a timeout is not very informative, so include the "function".
-    {ok, _} = timer:exit_after(Tmo, {timeout, F}),
+    {ok, _} = timer:exit_after(Tmo, {timeout, F, Tmo}),
     eval(F);
 
 eval({M,[F|A]})