From 6e33274c852f60eccbdc610b0525c3541d36aa89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 1 May 2013 18:20:56 +0200 Subject: Update Ranch to 0.8.2 and use ct_helper for testing SSL --- test/http_SUITE.erl | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'test/http_SUITE.erl') diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl index 98d4376..21cdd4b 100644 --- a/test/http_SUITE.erl +++ b/test/http_SUITE.erl @@ -209,11 +209,8 @@ init_per_group(http, Config) -> {transport, Transport}, {client, Client}|Config1]; init_per_group(https, Config) -> Transport = ranch_ssl, - Opts = [ - {certfile, ?config(data_dir, Config) ++ "ssl/cert.pem"}, - {keyfile, ?config(data_dir, Config) ++ "ssl/key.pem"}, - {password, "cowboy"} - ], + {_, Cert, Key} = ct_helper:make_certs(), + Opts = [{cert, Cert}, {key, Key}], Config1 = init_static_dir(Config), application:start(public_key), application:start(ssl), @@ -241,11 +238,8 @@ init_per_group(http_compress, Config) -> {transport, Transport}, {client, Client}|Config1]; init_per_group(https_compress, Config) -> Transport = ranch_ssl, - Opts = [ - {certfile, ?config(data_dir, Config) ++ "ssl/cert.pem"}, - {keyfile, ?config(data_dir, Config) ++ "ssl/key.pem"}, - {password, "cowboy"} - ], + {_, Cert, Key} = ct_helper:make_certs(), + Opts = [{cert, Cert}, {key, Key}], Config1 = init_static_dir(Config), application:start(public_key), application:start(ssl), -- cgit v1.2.3