Merge branch 'siri/cuddle-maint' into maint

* siri/cuddle-maint:
  [sasl test] Skip tests on slow host
  [sasl test] Catch erlang:port_close/1
  [ct test] Extent node startup timeouts in netconfc_remote_SUITE
  [ct test] Monitor netconf server during transaction
  [sasl test] Extend wait time when starting nodes
  [ct test] Skip system time related tests on TimeWarpingOS

3 files changed, 47 insertions, 16 deletions

diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index 9879e0f20d..cbbfe408a8 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -113,10 +113,14 @@ userconfig_static(Config) when is_list(Config) ->
              ["config_static_SUITE"]).
 
 userconfig_dynamic(Config) when is_list(Config) ->
-    run_test(config_dynamic_SUITE,
-	     Config,
-	     {userconfig, {config_driver, "config_server"}},
-             ["config_dynamic_SUITE"]).
+    case skip_dynamic() of
+	true -> {skip,"TimeWarpingOS"};
+	false ->
+	    run_test(config_dynamic_SUITE,
+		     Config,
+		     {userconfig, {config_driver, "config_server"}},
+		     ["config_dynamic_SUITE"])
+    end.
 
 testspec_legacy(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
@@ -147,16 +151,20 @@ testspec_static(Config) when is_list(Config) ->
     file:delete(filename:join(ConfigDir, "spec_static.spec")).
 
 testspec_dynamic(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir, Config),
-    ConfigDir = ?config(config_dir, Config),
-    make_spec(DataDir, ConfigDir, "spec_dynamic.spec",
-	      [config_dynamic_SUITE],
-	      [{userconfig, {config_driver, "config_server"}}]),
-    run_test(config_dynamic_SUITE,
-	     Config,
-	     {spec, filename:join(ConfigDir, "spec_dynamic.spec")},
-             []),
-    file:delete(filename:join(ConfigDir, "spec_dynamic.spec")).
+    case skip_dynamic() of
+	true -> {skip,"TimeWarpingOS"};
+	false ->
+	    DataDir = ?config(data_dir, Config),
+	    ConfigDir = ?config(config_dir, Config),
+	    make_spec(DataDir, ConfigDir, "spec_dynamic.spec",
+		      [config_dynamic_SUITE],
+		      [{userconfig, {config_driver, "config_server"}}]),
+	    run_test(config_dynamic_SUITE,
+		     Config,
+		     {spec, filename:join(ConfigDir, "spec_dynamic.spec")},
+		     []),
+	    file:delete(filename:join(ConfigDir, "spec_dynamic.spec"))
+    end.
 
 
 
@@ -198,6 +206,23 @@ setup_env(Test, Config, CTConfig) ->
 reformat_events(Events, EH) ->
     ct_test_support:reformat(Events, EH).
 
+
+%%%-----------------------------------------------------------------
+%%% Test related to 'localtime' will often fail if the test host is
+%%% time warping, so let's just skip the 'dynamic' tests then.
+skip_dynamic() ->
+    case os:getenv("TS_EXTRA_PLATFORM_LABEL") of
+	TSExtraPlatformLabel when is_list(TSExtraPlatformLabel) ->
+	    case string:str(TSExtraPlatformLabel,"TimeWarpingOS") of
+		0 -> false;
+		_ -> true
+	    end;
+	_ ->
+	    false
+    end.
+
+
+
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
index a65275da43..f2580ad8e9 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
@@ -83,7 +83,9 @@ end_per_suite(Config) ->
 %% Running the netconf server in a remote node, test that the client
 %% process terminates if the remote node goes down.
 remote_crash(Config) ->
-    {ok,Node} = ct_slave:start(nc_remote_crash),
+    {ok,Node} = ct_slave:start(nc_remote_crash,[{boot_timeout,15},
+						{init_timeout,15},
+						{startup_timeout,15}]),
     Pa = filename:dirname(code:which(?NS)),
     true = rpc:call(Node,code,add_patha,[Pa]),
     rpc:call(Node,code,load_file,[crypto]),
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index e62bc617fa..2412ea6aba 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -302,10 +302,14 @@ table_trans(Fun,Args) ->
 	S ->
 	    apply(Fun,Args);
 	Pid ->
+	    Ref = erlang:monitor(process,Pid),
 	    Pid ! {table_trans,Fun,Args,self()},
 	    receive
 		{table_trans_done,Result} ->
-		    Result
+		    erlang:demonitor(Ref,[flush]),
+		    Result;
+		{'DOWN',Ref,process,Pid,Reason} ->
+		    exit({main_ns_proc_died,Reason})
 	    after 20000 ->
 		    exit(table_trans_timeout)
 	    end