diff options
| author | Henrik Nord <[email protected]> | 2012-02-14 10:59:32 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-02-14 10:59:32 +0100 |
| commit | 77cd9f071c653810c7db99a635b73320e1a1863e (patch) | |
| tree | 7a6134063384dc3d0e7a89f7eccbc7c641b30235 /lib/ssl/test | |
| parent | 5d51c5ee85e59b29dd23f63d494b54649fa90739 (diff) | |
| parent | fb90763e3da5b93e75908f5b0bb97f58163b910b (diff) | |
| download | otp-77cd9f071c653810c7db99a635b73320e1a1863e.tar.gz otp-77cd9f071c653810c7db99a635b73320e1a1863e.tar.bz2 otp-77cd9f071c653810c7db99a635b73320e1a1863e.zip | |
Merge branch 'pg/ssl_dist-fixes' into maint
* pg/ssl_dist-fixes:
Robustness and improvement to distribution over SSL
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_dist_SUITE.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl index 8fe55ee7a4..06182970e3 100644 --- a/lib/ssl/test/ssl_dist_SUITE.erl +++ b/lib/ssl/test/ssl_dist_SUITE.erl @@ -26,7 +26,7 @@ -define(DEFAULT_TIMETRAP_SECS, 240). --define(AWAIT_SLL_NODE_UP_TIMEOUT, 30000). +-define(AWAIT_SSL_NODE_UP_TIMEOUT, 30000). -record(node_handle, {connection_handler, @@ -120,6 +120,12 @@ basic(Config) when is_list(Config) -> pang = net_adm:ping(Node1), pang = net_adm:ping(Node2), + %% SSL nodes should not be able to communicate with the test_server node + %% either (and ping should return eventually). + TestServer = node(), + pang = apply_on_ssl_node(NH1, fun () -> net_adm:ping(TestServer) end), + pang = apply_on_ssl_node(NH2, fun () -> net_adm:ping(TestServer) end), + %% %% Check that we are able to communicate over the erlang %% distribution between the ssl nodes. @@ -380,7 +386,7 @@ mk_node_cmdline(ListenPort, Name, Args) -> %% await_ssl_node_up(Name, LSock) -> - case gen_tcp:accept(LSock, ?AWAIT_SLL_NODE_UP_TIMEOUT) of + case gen_tcp:accept(LSock, ?AWAIT_SSL_NODE_UP_TIMEOUT) of timeout -> gen_tcp:close(LSock), ?t:format("Timeout waiting for ssl node ~s to come up~n", |