From 4368c69a82403d6d69f2d76d50821ef386755aec Mon Sep 17 00:00:00 2001 From: firest Date: Mon, 18 Apr 2022 15:28:46 +0800 Subject: [PATCH 1/2] test(gateway): increase gen_tcp:recv wait time in stomp test case --- apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl b/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl index 2e04680a7..f761d436d 100644 --- a/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl +++ b/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl @@ -312,7 +312,7 @@ t_case_stomp_subscribe(_) -> emqx:publish(Msg), timer:sleep(100), - {ok, Data1} = gen_tcp:recv(Sock, 0, 2000), + {ok, Data1} = gen_tcp:recv(Sock, 0, 5000), {ok, Frame1, _, _} = Mod:parse(Data1), Checker(Frame1) end, From e5c062582f12d2c06681c988575b7d802daecd1d Mon Sep 17 00:00:00 2001 From: firest Date: Mon, 18 Apr 2022 17:17:34 +0800 Subject: [PATCH 2/2] test(gateway): increase timeout in stomp test case --- apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl b/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl index f761d436d..2b933b178 100644 --- a/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl +++ b/apps/emqx_gateway/test/emqx_gateway_authz_SUITE.erl @@ -307,12 +307,12 @@ t_case_stomp_subscribe(_) -> ) ), - timer:sleep(100), + timer:sleep(200), Msg = emqx_message:make(Topic, Payload), emqx:publish(Msg), - timer:sleep(100), - {ok, Data1} = gen_tcp:recv(Sock, 0, 5000), + timer:sleep(200), + {ok, Data1} = gen_tcp:recv(Sock, 0, 10000), {ok, Frame1, _, _} = Mod:parse(Data1), Checker(Frame1) end, @@ -406,7 +406,11 @@ t_case_exproto_subscribe(_) -> %% Helpers %%------------------------------------------------------------------------------ try_publish_recv(Topic, Publish, Checker) -> + try_publish_recv(Topic, Publish, Checker, 500). + +try_publish_recv(Topic, Publish, Checker, Timeout) -> emqx:subscribe(Topic), + timer:sleep(200), Clear = fun(Msg) -> emqx:unsubscribe(Topic), Checker(Msg) @@ -416,7 +420,7 @@ try_publish_recv(Topic, Publish, Checker) -> receive {deliver, Topic, Msg} -> Clear(Msg) - after 500 -> + after Timeout -> Clear(timeout) end.