aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-05-03 08:13:58 +0200
committerJohn Högberg <[email protected]>2018-05-03 08:13:58 +0200
commit7588c6f850c59ef2fa338b38ac1cf141af4f69f2 (patch)
treefb09c33a2e38eed82111a263b6ce595c67ef1b36 /lib/kernel
parent6ab00dd854b70e0a4ad06fa802a5ebb1b4871721 (diff)
parent26eea10dda1f316045e58e30a126feafe1843d3a (diff)
downloadotp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.tar.gz
otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.tar.bz2
otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes Update version numbers ssl: Prepare for release ssl: Proper handling of clients that choose to send an empty answer to a certificate request heart: Use ntohs instead of manual conversion
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/heart_SUITE.erl13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 45032faf6d..22db24de5f 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -346,9 +346,16 @@ clear_cmd(Config) when is_list(Config) ->
get_cmd(Config) when is_list(Config) ->
{ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
- Cmd = "test",
- ok = rpc:call(Node, heart, set_cmd, [Cmd]),
- {ok, Cmd} = rpc:call(Node, heart, get_cmd, []),
+
+ ShortCmd = "test",
+ ok = rpc:call(Node, heart, set_cmd, [ShortCmd]),
+ {ok, ShortCmd} = rpc:call(Node, heart, get_cmd, []),
+
+ %% This would hang prior to OTP-15024 being fixed.
+ LongCmd = [$a || _ <- lists:seq(1, 160)],
+ ok = rpc:call(Node, heart, set_cmd, [LongCmd]),
+ {ok, LongCmd} = rpc:call(Node, heart, get_cmd, []),
+
stop_node(Node),
ok.