diff options
| -rw-r--r-- | examples/echo_get/README.md | 2 | ||||
| -rw-r--r-- | test/http_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/spdy_SUITE.erl | 29 |
3 files changed, 19 insertions, 14 deletions
diff --git a/examples/echo_get/README.md b/examples/echo_get/README.md index d6622fc..07bf833 100644 --- a/examples/echo_get/README.md +++ b/examples/echo_get/README.md @@ -12,7 +12,7 @@ $ make To start the release in the foreground: ``` bash -$ ./_rel/bin/get_echo_example console +$ ./_rel/bin/echo_get_example console ``` Then point your browser at diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl index 977cc1a..13e7b0b 100644 --- a/test/http_SUITE.erl +++ b/test/http_SUITE.erl @@ -535,7 +535,7 @@ check_status(Config) -> {403, "/static/unreadable"}, {404, "/not/found"}, {404, "/static/not_found"}, - {500, "/handler_errors?case=handler_before_reply"}, + {500, "/handler_errors?case=handle_before_reply"}, {500, "/handler_errors?case=init_before_reply"}, {666, "/init_shutdown"} ], diff --git a/test/spdy_SUITE.erl b/test/spdy_SUITE.erl index 2542840..c73c4f7 100644 --- a/test/spdy_SUITE.erl +++ b/test/spdy_SUITE.erl @@ -42,17 +42,22 @@ groups() -> ]}]. init_per_suite(Config) -> - application:start(crypto), - application:start(cowlib), - application:start(ranch), - application:start(cowboy), - application:start(asn1), - application:start(public_key), - application:start(ssl), - application:start(gun), - Dir = ?config(priv_dir, Config) ++ "/static", - ct_helper:create_static_dir(Dir), - [{static_dir, Dir}|Config]. + case proplists:get_value(ssl_app, ssl:versions()) of + Version when Version < "5.2.1" -> + {skip, "No NPN support in SSL application."}; + _ -> + application:start(crypto), + application:start(cowlib), + application:start(ranch), + application:start(cowboy), + application:start(asn1), + application:start(public_key), + application:start(ssl), + application:start(gun), + Dir = ?config(priv_dir, Config) ++ "/static", + ct_helper:create_static_dir(Dir), + [{static_dir, Dir}|Config] + end. end_per_suite(Config) -> Dir = ?config(static_dir, Config), @@ -103,7 +108,7 @@ quick_get(Pid, Host, Path) -> error(Reason); {gun_response, Pid, StreamRef, IsFin, << Status:3/binary, _/bits >>, Headers} -> - {IsFin, binary_to_integer(Status), Headers} + {IsFin, list_to_integer(binary_to_list(Status)), Headers} after 1000 -> error(timeout) end. |