Merge branch 'anders/diameter/test/OTP-12767' into maint-17

* anders/diameter/test/OTP-12767:
  Replace config suite call to erlang:now/0
  Fix incorrect suite usage of OTP 18 monotonic time
  Make tls suite crash more verbosely

4 files changed, 19 insertions, 19 deletions

diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl
index bbdf672291..4bcaa8119f 100644
--- a/lib/diameter/test/diameter_config_SUITE.erl
+++ b/lib/diameter/test/diameter_config_SUITE.erl
@@ -50,7 +50,7 @@
                 {request_errors, RE},
                 {call_mutates_state, C}]]
               || D <- [diameter_gen_base_rfc3588, diameter_gen_base_rfc6733],
-                 M <- [?MODULE, [?MODULE, now()]],
+                 M <- [?MODULE, [?MODULE, diameter_lib:now()]],
                  A <- [0, common, make_ref()],
                  S <- [[], make_ref()],
                  AE <- [report, callback, discard],
diff --git a/lib/diameter/test/diameter_tls_SUITE.erl b/lib/diameter/test/diameter_tls_SUITE.erl
index 55565692ec..e5bbda9c91 100644
--- a/lib/diameter/test/diameter_tls_SUITE.erl
+++ b/lib/diameter/test/diameter_tls_SUITE.erl
@@ -319,19 +319,19 @@ make_cert(Dir, Base) ->
     make_cert(Dir, Base ++ "_key.pem", Base ++ "_ca.pem").
 
 make_cert(Dir, Keyfile, Certfile) ->
-    [K,C] = Paths = [filename:join([Dir, F]) || F <- [Keyfile, Certfile]],
+    [KP,CP] = [filename:join([Dir, F]) || F <- [Keyfile, Certfile]],
 
-    KCmd = join(["openssl genrsa -out", K, "2048"]),
-    CCmd = join(["openssl req -new -x509 -key", K, "-out", C, "-days 7",
-                 "-subj /C=SE/ST=./L=Stockholm/CN=www.erlang.org"]),
+    KC = join(["openssl genrsa -out", KP, "2048"]),
+    CC = join(["openssl req -new -x509 -key", KP, "-out", CP, "-days 7",
+               "-subj /C=SE/ST=./L=Stockholm/CN=www.erlang.org"]),
 
     %% Hope for the best and only check that files are written.
-    os:cmd(KCmd),
-    os:cmd(CCmd),
+    [{_, _, {ok,_}},{_, _, {ok,_}}]
+        = [{P,O,T} || {P,C} <- [{KP,KC}, {CP,CC}],
+                      O <- [os:cmd(C)],
+                      T <- [file:read_file_info(P)]],
 
-    [_,_] = [T || P <- Paths, {ok, T} <- [file:read_file_info(P)]],
-
-    {K,C}.
+    {KP,CP}.
 
 join(Strs) ->
     string:join(Strs, " ").
diff --git a/lib/diameter/test/diameter_util.erl b/lib/diameter/test/diameter_util.erl
index c496876ee1..df7d268429 100644
--- a/lib/diameter/test/diameter_util.erl
+++ b/lib/diameter/test/diameter_util.erl
@@ -204,13 +204,14 @@ seed() ->
 %% unique_string/0
 
 unique_string() ->
-    us(diameter_lib:now()).
-
-us({M,S,U}) ->
-    tl(lists:append(["-" ++ integer_to_list(N) || N <- [M,S,U]]));
-
-us(MonoT) ->
-    integer_to_list(MonoT).
+    try erlang:unique_integer() of
+        N ->
+            integer_to_list(N)
+    catch
+        error: undef ->  %% OTP < 18
+            {M,S,U} = timestamp(),
+            tl(lists:append(["-" ++ integer_to_list(N) || N <- [M,S,U]]))
+    end.
 
 %% ---------------------------------------------------------------------------
 %% have_sctp/0
diff --git a/lib/diameter/test/diameter_watchdog_SUITE.erl b/lib/diameter/test/diameter_watchdog_SUITE.erl
index 5a3ff2c92f..f39e12686e 100644
--- a/lib/diameter/test/diameter_watchdog_SUITE.erl
+++ b/lib/diameter/test/diameter_watchdog_SUITE.erl
@@ -673,8 +673,7 @@ jitter(T,D) ->
 
 %% Generate a unique hostname for the faked peer.
 hostname() ->
-    {M,S,U} = diameter_util:timestamp(),
-    lists:flatten(io_lib:format("~p-~p-~p", [M,S,U])).
+    ?util:unique_string().
 
 putr(Key, Val) ->
     put({?MODULE, Key}, Val).