Merge branch 'siri/common_test/minor_test_fixes/OTP-10483'

* siri/common_test/minor_test_fixes/OTP-10483:
  [common_test] Extend timetrap time in ct_hooks_SUITE
  [common_test] Avoid hanging ct@host node if crypto does not exist
  [common_test] Changed call to publick_key to use documented interface
  [common_test] Extend timeout values for slave nodes in ct_master_SUITE
  [common_test] Extend valid interval for approximate timer values in tests

5 files changed, 10 insertions, 11 deletions

diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index 405df1e978..796a0832d7 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -64,7 +64,7 @@ end_per_testcase(TestCase, Config) ->
 
 
 suite() ->
-    [{timetrap,{seconds,20}}].
+    [{timetrap,{minutes,1}}].
 
 all() ->
     all(suite).
diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl
index 56a343a96f..b89d7d4dc5 100644
--- a/lib/common_test/test/ct_master_SUITE.erl
+++ b/lib/common_test/test/ct_master_SUITE.erl
@@ -154,6 +154,9 @@ make_spec(DataDir, FileName, NodeNames, Suites, Config) ->
 		   {init,NodeName,[
 				   {node_start,[{startup_functions,[]},
 						{monitor_master,true},
+						{boot_timeout,10},
+						{init_timeout,10},
+						{startup_timeout,10},
 						{env,Env}]},
 				   {eval,{erlang,nodes,[]}}]
 		   }
diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl
index 3042a924fe..c89a4cdabe 100644
--- a/lib/common_test/test/ct_netconfc_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE.erl
@@ -43,12 +43,11 @@
 %% there will be clashes with logging processes etc).
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    Config1 = ct_test_support:init_per_suite(Config),
     case application:load(crypto) of
-	{error,Reason} ->
+	{error,Reason} when Reason=/={already_loaded,crypto} ->
 	    {skip, Reason};
 	_ ->
-	    Config1
+	    ct_test_support:init_per_suite(Config)
     end.
 
 end_per_suite(Config) ->
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index d337158bce..54526e8e83 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -1044,12 +1044,9 @@ gen_dsa(LSize,NSize) when is_integer(LSize), is_integer(NSize) ->
     Key = gen_dsa2(LSize, NSize),
     {Key, encode_key(Key)}.
 
-encode_key(Key = #'RSAPrivateKey'{}) ->
-    {ok, Der} = 'OTP-PUB-KEY':encode('RSAPrivateKey', Key),
-    {'RSAPrivateKey', list_to_binary(Der), not_encrypted};
 encode_key(Key = #'DSAPrivateKey'{}) ->
-    {ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key),
-    {'DSAPrivateKey', list_to_binary(Der), not_encrypted}.
+    Der = public_key:der_encode('DSAPrivateKey', Key),
+    {'DSAPrivateKey', Der, not_encrypted}.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index fc572aa82f..8814570e99 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -1043,8 +1043,8 @@ result_match({SkipOrFail,{ErrorInd,{EMod,EFunc,{Why,'_'}}}},
     true;
 result_match({failed,{timetrap_timeout,{'$approx',Num}}},
 	     {failed,{timetrap_timeout,Value}}) ->
-    if Value >= trunc(Num-0.02*Num),
-       Value =< trunc(Num+0.02*Num) -> true;
+    if Value >= trunc(Num-0.05*Num),
+       Value =< trunc(Num+0.05*Num) -> true;
        true -> false
     end;
 result_match({user_timetrap_error,{Why,'_'}},