Merge branch 'bjorn/cuddle-with-tests'

* bjorn/cuddle-with-tests:
  inet_SUITE: Handle pointtopoint devices in getifaddrs/1
  file_SUITE: Increase timetrap for large_write/1
  gen_fsm_SUITE: Make abnormal1/1 stop failing
  gen_fsm_SUITE: Use timer:sleep/1 instead of ct:sleep/1
  inet_SUITE: Handle {error,enoent} in simple_netns_open
  inet_SUITE: Handle missing SCTP support in simple_netns/1
  asn1_SUITE: Remove temporary files
  file_name_SUITE: Improve handling of missing permission for link creation
  file_name_SUITE: Remove useless put/2 to process dictionary
  file_name_SUITE: Handle the case that HOMEPATH may not be set
  code_SUITE: Skip on_load_embedded/1 if no symlinks
  gen_sctp_SUITE: Skip most SCTP test cases on Solaris before 5.12
  heart_SUITE: Increase timeout in restart/1
  heart_SUITE: Use unique node names
  init_SUITE: Quote pathname that may contain a space
  gen_tcp_misc_SUITE: Clean up send_timeout{_active}/1
  Clean up the determination of the hostname

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index f79a344c4e..e23e747dee 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -391,6 +391,12 @@ abnormal1(Config) when is_list(Config) ->
     delayed = gen_fsm:sync_send_event(my_fsm, {delayed_answer,1}, 100),
     {'EXIT',{timeout,_}} =
 	(catch gen_fsm:sync_send_event(my_fsm, {delayed_answer,10}, 1)),
+    receive
+	Msg ->
+	    %% Ignore the delayed answer from the server.
+	    io:format("Delayed message: ~p", [Msg])
+    end,
+
     [] = get_messages(),
     ok.
 
@@ -971,7 +977,7 @@ init(stop) ->
 init(stop_shutdown) ->
     {stop, shutdown};
 init(sleep) ->
-    ct:sleep(1000),
+    timer:sleep(1000),
     {ok, idle, data};
 init({timeout, T}) ->
     {ok, idle, state, T};
@@ -1004,7 +1010,7 @@ idle(_, Data) ->
 idle({connect, _Pid}, _From, Data) ->
     {reply, accept, wfor_conf, Data};
 idle({delayed_answer, T}, _From, Data) ->
-    ct:sleep(T),
+    timer:sleep(T),
     {reply, delayed, idle, Data};
 idle(badreturn, _From, _Data) ->
     badreturn;