aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-06-15 15:30:35 +0200
committerSiri Hansen <[email protected]>2016-06-15 15:30:35 +0200
commit37464e088e9f4268c1d54d56d7cb31bec1cc140f (patch)
tree4f51c344b8e6195e739520c99931f70071a3d686 /lib/stdlib
parent2ce17d44eba8993985f49abafc78d6c0f99bef27 (diff)
parentc8a4098692b5ad5c813f7f97557800ea638db652 (diff)
downloadotp-37464e088e9f4268c1d54d56d7cb31bec1cc140f.tar.gz
otp-37464e088e9f4268c1d54d56d7cb31bec1cc140f.tar.bz2
otp-37464e088e9f4268c1d54d56d7cb31bec1cc140f.zip
Merge branch 'siri/cuddle-master'
* siri/cuddle-master: Add short sleep when killing slave nodes [ct test] Do reload_config instead of get_config
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/test/slave_SUITE.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/stdlib/test/slave_SUITE.erl b/lib/stdlib/test/slave_SUITE.erl
index 25b706e81f..7525cf78de 100644
--- a/lib/stdlib/test/slave_SUITE.erl
+++ b/lib/stdlib/test/slave_SUITE.erl
@@ -71,6 +71,7 @@ t_start_link(Config) when is_list(Config) ->
rpc:cast(Slave1, erlang, halt, []),
rpc:cast(Slave2, erlang, halt, []),
+ ct:sleep(250),
is_dead(Slave1),
is_dead(Slave2),