aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-11-26 12:27:44 +0100
committerZandra <[email protected]>2015-11-26 12:27:44 +0100
commitc06ea3ba3320740a448dbe2c361d6191eb2a9a46 (patch)
tree0e8cde0ff96e4162e76b981fbe501f68e6653044 /lib/ssl/test
parentef3156ad794c0cdc5332e2941fc7d4c7bf638115 (diff)
parent725184f45c1cf3dcfc2e9e27592b9489e1ed5141 (diff)
downloadotp-c06ea3ba3320740a448dbe2c361d6191eb2a9a46.tar.gz
otp-c06ea3ba3320740a448dbe2c361d6191eb2a9a46.tar.bz2
otp-c06ea3ba3320740a448dbe2c361d6191eb2a9a46.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test')
-rw-r--r--lib/ssl/test/ssl_dist_SUITE.erl13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 72d62b29a7..19ed4e1299 100644
--- a/lib/ssl/test/ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -40,7 +40,7 @@
%% Common Test interface functions -----------------------------------
%%--------------------------------------------------------------------
all() ->
- [basic, payload, plain_options, plain_verify_options].
+ [basic, payload, plain_options, plain_verify_options, nodelay_option].
groups() ->
[].
@@ -250,6 +250,17 @@ plain_verify_options(Config) when is_list(Config) ->
stop_ssl_node(NH1),
stop_ssl_node(NH2),
success(Config).
+%%--------------------------------------------------------------------
+nodelay_option() ->
+ [{doc,"Test specifying dist_nodelay option"}].
+nodelay_option(Config) ->
+ try
+ %% The default is 'true', so try setting it to 'false'.
+ application:set_env(kernel, dist_nodelay, false),
+ basic(Config)
+ after
+ application:unset_env(kernel, dist_nodelay)
+ end.
%%--------------------------------------------------------------------
%%% Internal functions -----------------------------------------------