yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9193 from zmstone/1020-chore-upgrade-gun-1.3.9 

1020 chore upgrade gun 1.3.9
This commit is contained in:
Zaiming (Stone) Shi 2022-10-21 08:13:21 +02:00 committed by GitHub
parent 8344d70e07 67dd733e8d
commit 0ca4f30a34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx/test/emqx_shared_sub_SUITE.erl
View File

@ -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.

2
mix.exs
View File

@ -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

2
rebar.config
View File

@ -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"}}}