diff options
| author | Zandra <[email protected]> | 2015-11-26 12:26:56 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-26 12:26:56 +0100 |
| commit | 725184f45c1cf3dcfc2e9e27592b9489e1ed5141 (patch) | |
| tree | 990f7f8ce10820979b301078d2e211cda28ff32f /lib/ssl/test/ssl_dist_SUITE.erl | |
| parent | 580d1bccabf9d005ce9d1bd1f8095bbb8130d899 (diff) | |
| parent | d5ce9036c629939cd979a03ace1b0107c23a9d78 (diff) | |
| download | otp-725184f45c1cf3dcfc2e9e27592b9489e1ed5141.tar.gz otp-725184f45c1cf3dcfc2e9e27592b9489e1ed5141.tar.bz2 otp-725184f45c1cf3dcfc2e9e27592b9489e1ed5141.zip | |
Merge branch 'legoscia/tls_dist_nodelay' into maint
* legoscia/tls_dist_nodelay:
Add test for dist_nodelay option
Honour dist_nodelay socket option in tls_dist proxy
OTP-13143
Diffstat (limited to 'lib/ssl/test/ssl_dist_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_dist_SUITE.erl | 13 |
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 ----------------------------------------------- |