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

Merge pull request #11818 from zmstone/1025-fix-flaky-test 

test: fix a flaky test case emqx_crl_cache_SUITE:t_revoked
This commit is contained in:
Zaiming (Stone) Shi 2023-10-25 20:46:31 +02:00 committed by GitHub
parent ae49750b3e 76a8b0efd4
commit 97601171a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx/rebar.config
View File

@ -45,7 +45,7 @@
{meck, "0.9.2"},
{proper, "1.4.0"},
{bbmustache, "1.10.0"},
{emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.0"}}}
{emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.1"}}}
]},
{extra_src_dirs, [{"test", [recursive]},
{"integration_test", [recursive]}]}
@ -55,7 +55,7 @@
{meck, "0.9.2"},
{proper, "1.4.0"},
{bbmustache, "1.10.0"},
{emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.0"}}}
{emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.1"}}}
]},
{extra_src_dirs, [{"test", [recursive]}]}
]}

11
apps/emqx/test/emqx_crl_cache_SUITE.erl
View File

@ -941,10 +941,13 @@ t_revoked(Config) ->
{port, 8883}
]),
unlink(C),
?assertMatch(
{error, {ssl_error, _Sock, {tls_alert, {certificate_revoked, _}}}}, emqtt:connect(C)
),
ok.
case emqtt:connect(C) of
{error, {ssl_error, _Sock, {tls_alert, {certificate_revoked, _}}}} ->
ok;
{error, closed} ->
%% this happens due to an unidentified race-condition
ok
end.
t_revoke_then_refresh(Config) ->
DataDir = ?config(data_dir, Config),

2
apps/emqx_retainer/rebar.config
View File

@ -30,7 +30,7 @@
{profiles, [
{test, [
{deps, [
{emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.0"}}}
{emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.1"}}}
]}
]}
]}.

2
mix.exs
View File

@ -64,7 +64,7 @@ defmodule EMQXUmbrella.MixProject do
{:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true},
# maybe forbid to fetch quicer
{:emqtt,
github: "emqx/emqtt", tag: "1.9.0", override: true, system_env: maybe_no_quic_env()},
github: "emqx/emqtt", tag: "1.9.1", override: true, system_env: maybe_no_quic_env()},
{:rulesql, github: "emqx/rulesql", tag: "0.1.7"},
{:observer_cli, "1.7.1"},
{:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.3"},

2
rebar.config
View File

@ -69,7 +69,7 @@
, {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.4"}}}
, {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.7"}}}
, {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}}
, {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.0"}}}
, {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.9.1"}}}
, {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.7"}}}
, {observer_cli, "1.7.1"} % NOTE: depends on recon 2.5.x
, {system_monitor, {git, "https://github.com/ieQu1/system_monitor", {tag, "3.0.3"}}}