File 1164-runtime_tools-tests-Eliminate-use-of-depre... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1164-runtime_tools-tests-Eliminate-use-of-deprecated-now-.patch of Package erlang (Revision a2c746346df91f7eba485155dba10e85)

Currently displaying revision a2c746346df91f7eba485155dba10e85 , Show latest

From 7ddcd3c6ef13cd2bfb23ee67c7d39fafe12ce0c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 25 Feb 2021 09:59:17 +0100
Subject: [PATCH 4/9] runtime_tools tests: Eliminate use of deprecated now/0

---
 lib/runtime_tools/test/dbg_SUITE.erl          | 36 +++++++------------
 .../test/erts_alloc_config_SUITE.erl          |  2 +-
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index 31605d7da5..2906824f6e 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -564,15 +564,10 @@ ip_port_busy(Config) when is_list(Config) ->
     end,
     ok.
 
-
-
 %% Test tracing to file port (simple)
 file_port(Config) when is_list(Config) ->
     stop(),
-    {A,B,C} = erlang:now(),
-    FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++ "-" ++
-    integer_to_list(B) ++ "-" ++ integer_to_list(C),
-    FName = filename:join([proplists:get_value(data_dir, Config), FTMP]),
+    FName = make_temp_name(Config),
     Port = dbg:trace_port(file, FName),
     {ok, _} = dbg:tracer(port, Port),
     try
@@ -598,12 +593,8 @@ file_port(Config) when is_list(Config) ->
 %% Test tracing to file port with 'follow_file'
 file_port2(Config) when is_list(Config) ->
     stop(),
-    {A,B,C} = erlang:now(),
-    FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++
-    "-" ++ integer_to_list(B) ++ "-" ++ integer_to_list(C),
-    FName = filename:join([proplists:get_value(data_dir, Config), FTMP]),
-    %% Ok, lets try with flush and follow_file, not a chance on VxWorks
-    %% with NFS caching...
+    FName = make_temp_name(Config),
+    %% Ok, lets try with flush and follow_file.
     Port2 = dbg:trace_port(file, FName),
     {ok, _} = dbg:tracer(port, Port2),
     try
@@ -632,11 +623,8 @@ file_port2(Config) when is_list(Config) ->
 wrap_port(Config) when is_list(Config) ->
     Self = self(),
     stop(),
-    {A,B,C} = erlang:now(),
-    FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++ "-" ++
-    integer_to_list(B) ++ "-" ++ integer_to_list(C) ++ "-",
-    FName = filename:join([proplists:get_value(data_dir, Config), FTMP]),
-    FNameWildcard = FName++"*"++".trace",
+    FName = make_temp_name(Config),
+    FNameWildcard = FName ++ "*" ++ ".trace",
     %% WrapSize=0 and WrapCnt=11 will force the trace to wrap after
     %% every trace message, and to contain only the last 10 entries
     %% after trace stop since the last file will be empty waiting
@@ -726,10 +714,7 @@ wrap_port_result([{trace, S, call, {?MODULE, tracee2, [M]}, hej},
 %% Test tracing to time limited wrapping file port
 wrap_port_time(Config) when is_list(Config) ->
     stop(),
-    {A,B,C} = erlang:now(),
-    FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++ "-" ++
-    integer_to_list(B) ++ "-" ++ integer_to_list(C) ++ "-",
-    FName = filename:join([proplists:get_value(data_dir, Config), FTMP]),
+    FName = make_temp_name(Config),
     %% WrapTime=2 and WrapCnt=4 will force the trace to wrap after
     %% every 2 seconds, and to contain between 3*2 and 4*2 seconds
     %% of trace entries.
@@ -938,8 +923,7 @@ trace(_, _, _, _, _) ->
 %%
 
 start_slave() ->
-    {A, B, C} = now(),
-    Name = "asdkxlkmd" ++ integer_to_list(A+B+C),
+    Name = "asdkxlkmd" ++ integer_to_list(erlang:unique_integer([positive])),
     {ok, Node} = test_server:start_node(Name,slave,[]),
     ok = wait_node(Node, 15),
     Node.
@@ -991,3 +975,9 @@ start() ->
 
 stop() ->
     dbg:stop().
+
+make_temp_name(Config) ->
+    {A,B,C} = erlang:timestamp(),
+    FTMP = atom_to_list(?MODULE) ++ integer_to_list(A) ++ "-" ++
+    integer_to_list(B) ++ "-" ++ integer_to_list(C),
+    filename:join(proplists:get_value(data_dir, Config), FTMP).
diff --git a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
index 9ab61b89d2..5fbddc89fa 100644
--- a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
+++ b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
@@ -161,7 +161,7 @@ display_file(FileName) ->
     ok.
 
 mk_name(Config) when is_list(Config) ->
-    {A, B, C} = now(),
+    {A, B, C} = erlang:timestamp(),
     list_to_atom(atom_to_list(?MODULE)
                  ++ "-" ++ atom_to_list(proplists:get_value(testcase, Config))
                  ++ "-" ++ integer_to_list(A)
-- 
2.26.2

Places

File 1164-runtime_tools-tests-Eliminate-use-of-deprecated-now-.patch of Package erlang (Revision a2c746346df91f7eba485155dba10e85)

Places