aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-06-01 15:04:09 +0200
committerSiri Hansen <[email protected]>2016-06-01 15:04:09 +0200
commit77b6b9a3c5d044a832ba36f8683bbe88279d8c88 (patch)
treef0ee920f34102dcea446c94b5a52d2b19ac011ad /lib/stdlib
parentd46e634b1c4ab0d88597c7bdff69a646a54f4477 (diff)
parent1964b89cb2ce66841467c15ea135e1ee1a292709 (diff)
downloadotp-77b6b9a3c5d044a832ba36f8683bbe88279d8c88.tar.gz
otp-77b6b9a3c5d044a832ba36f8683bbe88279d8c88.tar.bz2
otp-77b6b9a3c5d044a832ba36f8683bbe88279d8c88.zip
Merge branch 'siri/cuddle-master'
* siri/cuddle-master: Change ct:sleep to timer:sleep where scaling is not wanted Don't generate ssh key files in netconf client test Ignore data received in break mode in test telnet_server Wait for process to die before next call Retry ct_telnet:get_data if no data is received after short wait Don't throw rest of line when NOP is received in test telnet_server Change ct:sleep to timer:sleep in telnet_server
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/test/gen_server_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index 3242511f4a..338cd3dc0a 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -185,7 +185,7 @@ start(Config) when is_list(Config) ->
gen_server:start({global, my_test_name},
gen_server_SUITE, [], []),
ok = gen_server:call({global, my_test_name}, stop),
- ct:sleep(1),
+ busy_wait_for_process(Pid4,600),
{'EXIT', {noproc,_}} = (catch gen_server:call(Pid4, started_p, 10)),
%% global register linked
@@ -214,7 +214,7 @@ start(Config) when is_list(Config) ->
gen_server:start({via, dummy_via, my_test_name},
gen_server_SUITE, [], []),
ok = gen_server:call({via, dummy_via, my_test_name}, stop),
- ct:sleep(1),
+ busy_wait_for_process(Pid6,600),
{'EXIT', {noproc,_}} = (catch gen_server:call(Pid6, started_p, 10)),
%% via register linked