diff options
| author | Loïc Hoguin <[email protected]> | 2013-05-01 18:20:56 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2013-05-01 18:30:00 +0200 |
| commit | 6e33274c852f60eccbdc610b0525c3541d36aa89 (patch) | |
| tree | e871a8d9e1cf71dae4405055dda37e4c1019c895 /test/http_SUITE.erl | |
| parent | ed2efbc4a10ef27d6ab42e7bb9db37ac3f47b3c3 (diff) | |
| download | cowboy-6e33274c852f60eccbdc610b0525c3541d36aa89.tar.gz cowboy-6e33274c852f60eccbdc610b0525c3541d36aa89.tar.bz2 cowboy-6e33274c852f60eccbdc610b0525c3541d36aa89.zip | |
Update Ranch to 0.8.2 and use ct_helper for testing SSL
Diffstat (limited to 'test/http_SUITE.erl')
| -rw-r--r-- | test/http_SUITE.erl | 14 |
1 files changed, 4 insertions, 10 deletions
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), |