valitydev/riak_test
14
0
Fork 0
mirror of https://github.com/valitydev/riak_test.git synced 2024-11-06 08:35:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #717 from basho/bugfix/sdc/cert-name-collisions

Browse Source 
Fix pb_security failures
This commit is contained in:
Sean Cribbs 2014-12-29 16:24:49 -06:00
commit 1af1b32937
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/pb_cipher_suites.erl
View File

@ -28,10 +28,13 @@ confirm() ->
make_certs:revoke(CertDir, "rootCA", "revokedCA"),
%% start a HTTP server to serve the CRLs
inets:start(httpd, [{port, 8000}, {server_name, "localhost"},
%%
%% NB: we use the 'stand_alone' option to link the server to the
%% test process, so it exits when the test process exits.
{ok, _HTTPPid} = inets:start(httpd, [{port, 8000}, {server_name, "localhost"},
{server_root, "/tmp"},
{document_root, CertDir},
{modules, [mod_get]}]),
{modules, [mod_get]}], stand_alone),
lager:info("Deploy some nodes"),
Conf = [{riak_core, [

7
tests/pb_security.erl
View File

@ -41,10 +41,13 @@ confirm() ->
make_certs:gencrl(CertDir, "site1.basho.com"),
%% start a HTTP server to serve the CRLs
inets:start(httpd, [{port, 8000}, {server_name, "localhost"},
%%
%% NB: we use the 'stand_alone' option to link the server to the
%% test process, so it exits when the test process exits.
{ok, _HTTPPid} = inets:start(httpd, [{port, 8000}, {server_name, "localhost"},
{server_root, "/tmp"},
{document_root, CertDir},
{modules, [mod_get]}]),
{modules, [mod_get]}], stand_alone),
lager:info("Deploy some nodes"),
PrivDir = rt:priv_dir(),