From 916bfde1f8fd09483068819c121bb2b698eae8bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 27 Nov 2012 17:31:54 +0100 Subject: Fix a test that worked intermittently --- test/ws_SUITE.erl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl index 9741329..7f1a18f 100644 --- a/test/ws_SUITE.erl +++ b/test/ws_SUITE.erl @@ -332,12 +332,11 @@ ws_send_many(Config) -> {'Upgrade', "websocket"} = lists:keyfind('Upgrade', 1, Headers), {"sec-websocket-accept", "s3pPLMBiTxaQ9kYGzzhZRbK+xOo="} = lists:keyfind("sec-websocket-accept", 1, Headers), - {ok, << 1:1, 0:3, 1:4, 0:1, 3:7, "one" >>} - = gen_tcp:recv(Socket, 0, 6000), - {ok, << 1:1, 0:3, 1:4, 0:1, 3:7, "two" >>} - = gen_tcp:recv(Socket, 0, 6000), - {ok, << 1:1, 0:3, 1:4, 0:1, 6:7, "seven!" >>} - = gen_tcp:recv(Socket, 0, 6000), + %% We catch all frames at once and check them directly. + {ok, Many} = gen_tcp:recv(Socket, 18, 6000), + << 1:1, 0:3, 1:4, 0:1, 3:7, "one", + 1:1, 0:3, 1:4, 0:1, 3:7, "two", + 1:1, 0:3, 1:4, 0:1, 6:7, "seven!" >> = Many, ok = gen_tcp:send(Socket, << 1:1, 0:3, 8:4, 0:8 >>), %% close {ok, << 1:1, 0:3, 8:4, 0:8 >>} = gen_tcp:recv(Socket, 0, 6000), {error, closed} = gen_tcp:recv(Socket, 0, 6000), -- cgit v1.2.3