From b3ffe89f3521f93207de36765a089e0eda264f39 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 19 Oct 2022 18:16:38 +0200 Subject: [PATCH 1/2] test: assert message receive pid is in the expected pids list --- apps/emqx/test/emqx_shared_sub_SUITE.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/emqx/test/emqx_shared_sub_SUITE.erl b/apps/emqx/test/emqx_shared_sub_SUITE.erl index dab4c698a..bc519117b 100644 --- a/apps/emqx/test/emqx_shared_sub_SUITE.erl +++ b/apps/emqx/test/emqx_shared_sub_SUITE.erl @@ -465,7 +465,7 @@ last_message(ExpectedPayload, Pids) -> last_message(ExpectedPayload, Pids, Timeout) -> receive {publish, #{client_pid := Pid, payload := ExpectedPayload}} -> - ct:pal("~p ====== ~p", [Pids, Pid]), + ?assert(lists:member(Pid, Pids)), {true, Pid} after Timeout -> ct:pal("not yet"), @@ -864,9 +864,9 @@ t_session_takeover(Config) when is_list(Config) -> {ok, _} = emqtt:connect(ConnPid2), ?assertMatch([_], emqx:publish(Message3)), ?assertMatch([_], emqx:publish(Message4)), - {true, _} = last_message(<<"hello2">>, [ConnPid1]), - {true, _} = last_message(<<"hello3">>, [ConnPid1]), - {true, _} = last_message(<<"hello4">>, [ConnPid1]), + {true, _} = last_message(<<"hello2">>, [ConnPid2]), + {true, _} = last_message(<<"hello3">>, [ConnPid2]), + {true, _} = last_message(<<"hello4">>, [ConnPid2]), ?assertEqual([], collect_msgs(timer:seconds(2))), emqtt:stop(ConnPid2), ok. From 67dd733e8d3ede357d109d0068725d1eeeeb451f Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 20 Oct 2022 18:34:35 +0200 Subject: [PATCH 2/2] chore: bump to gun 1.3.9 1.3.7 had a bug which caused ssl_passive message unhandled --- mix.exs | 2 +- rebar.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mix.exs b/mix.exs index a2863f137..43024c116 100644 --- a/mix.exs +++ b/mix.exs @@ -71,7 +71,7 @@ defmodule EMQXUmbrella.MixProject do {:esasl, github: "emqx/esasl", tag: "0.2.0"}, {:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"}, # in conflict by ehttpc and emqtt - {:gun, github: "emqx/gun", tag: "1.3.7", override: true}, + {:gun, github: "emqx/gun", tag: "1.3.9", override: true}, # in conflict by emqx_connectior and system_monitor {:epgsql, github: "emqx/epgsql", tag: "4.7-emqx.2", override: true}, # in conflict by mongodb and eredis_cluster diff --git a/rebar.config b/rebar.config index 9be69d963..f415b5901 100644 --- a/rebar.config +++ b/rebar.config @@ -48,7 +48,7 @@ , {redbug, "2.0.7"} , {gpb, "4.19.5"} %% gpb only used to build, but not for release, pin it here to avoid fetching a wrong version due to rebar plugins scattered in all the deps , {typerefl, {git, "https://github.com/ieQu1/typerefl", {tag, "0.9.1"}}} - , {gun, {git, "https://github.com/emqx/gun", {tag, "1.3.7"}}} + , {gun, {git, "https://github.com/emqx/gun", {tag, "1.3.9"}}} , {ehttpc, {git, "https://github.com/emqx/ehttpc", {tag, "0.3.0"}}} , {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}} , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}