0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00

Fix tests for most recent Gun

This commit is contained in:
Loïc Hoguin 2018-06-26 10:32:33 +02:00
parent b2b5e3a01a
commit 7867e435fe
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
2 changed files with 7 additions and 7 deletions

View file

@ -436,23 +436,23 @@ websocket(Config) ->
{ok, Pid} = gun:open("127.0.0.1", 8080, #{protocols => [http], retry => 0}),
{ok, http} = gun:await_up(Pid),
_ = monitor(process, Pid),
gun:ws_upgrade(Pid, "/websocket", [], #{compress => true}),
StreamRef = gun:ws_upgrade(Pid, "/websocket", [], #{compress => true}),
receive
{gun_ws_upgrade, Pid, ok, _} ->
{gun_upgrade, Pid, StreamRef, _, _} ->
ok;
Msg1 ->
exit({connection_failed, Msg1})
end,
%% Check that we receive the message sent on timer on init.
receive
{gun_ws, Pid, {text, <<"Hello!">>}} ->
{gun_ws, Pid, StreamRef, {text, <<"Hello!">>}} ->
ok
after 2000 ->
exit(timeout)
end,
%% Check that we receive subsequent messages sent on timer.
receive
{gun_ws, Pid, {text, <<"How' you doin'?">>}} ->
{gun_ws, Pid, StreamRef, {text, <<"How' you doin'?">>}} ->
ok
after 2000 ->
exit(timeout)
@ -460,7 +460,7 @@ websocket(Config) ->
%% Check that we receive the echoed message.
gun:ws_send(Pid, {text, <<"hello">>}),
receive
{gun_ws, Pid, {text, <<"That's what she said! hello">>}} ->
{gun_ws, Pid, StreamRef, {text, <<"That's what she said! hello">>}} ->
ok
after 500 ->
exit(timeout)

View file

@ -371,7 +371,7 @@ do_ws(Config) ->
doc("Confirm metrics are correct when switching to Websocket."),
ConnPid = gun_open(Config),
{ok, http} = gun:await_up(ConnPid),
gun:ws_upgrade(ConnPid, "/ws_echo", [
StreamRef = gun:ws_upgrade(ConnPid, "/ws_echo", [
{<<"accept-encoding">>, <<"gzip">>},
{<<"x-test-pid">>, pid_to_list(self())}
]),
@ -428,7 +428,7 @@ do_ws(Config) ->
end,
%% And of course the upgrade completed successfully after that.
receive
{gun_ws_upgrade, ConnPid, ok, _} ->
{gun_upgrade, ConnPid, StreamRef, _, _} ->
ok
after 1000 ->
error(timeout)