Add tests when server/client doesn't support SSL, but other side does

This commit is contained in:
Andrew Thompson 2013-04-03 13:43:08 -04:00
parent b7dfd55554
commit fadc9853c3

View File

@ -10,11 +10,15 @@ confirm() ->
lager:info("Deploy ~p nodes", [NumNodes]), lager:info("Deploy ~p nodes", [NumNodes]),
BaseConf = [ BaseConf = [
{riak_repl, {riak_core,
[ [
{ssl_enabled, false}
]},
{riak_repl,
[
{fullsync_on_connect, false}, {fullsync_on_connect, false},
{fullsync_interval, disabled} {fullsync_interval, disabled}
]} ]}
], ],
%% XXX for some reason, codew:priv_dir returns riak_test/riak_test/priv, %% XXX for some reason, codew:priv_dir returns riak_test/riak_test/priv,
@ -207,6 +211,16 @@ confirm() ->
?assertEqual(fail, test_connection({Node1, merge_config(SSLConfig1, BaseConf)}, ?assertEqual(fail, test_connection({Node1, merge_config(SSLConfig1, BaseConf)},
{Node2, merge_config(SSLConfig1, BaseConf)})), {Node2, merge_config(SSLConfig1, BaseConf)})),
lager:info("===testing you can't connect when peer doesn't support SSL"),
rt:log_to_nodes([Node1, Node2], "Testing missing ssl on peer fails"),
?assertEqual(fail, test_connection({Node1, merge_config(SSLConfig1, BaseConf)},
{Node2, BaseConf})),
lager:info("===testing you can't connect when local doesn't support SSL"),
rt:log_to_nodes([Node1, Node2], "Testing missing ssl locally fails"),
?assertEqual(fail, test_connection({Node1, BaseConf},
{Node2, merge_config(SSLConfig2, BaseConf)})),
lager:info("===testing simple SSL connectivity"), lager:info("===testing simple SSL connectivity"),
rt:log_to_nodes([Node1, Node2], "Basic SSL test"), rt:log_to_nodes([Node1, Node2], "Basic SSL test"),
?assertEqual(ok, test_connection({Node1, merge_config(SSLConfig1, BaseConf)}, ?assertEqual(ok, test_connection({Node1, merge_config(SSLConfig1, BaseConf)},