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

Merge pull request #10291 from zmstone/0330-fix-flaky-test-influxdb 

test: fix flaky influxdb test
This commit is contained in:
Zaiming (Stone) Shi 2023-03-31 15:36:12 +02:00 committed by GitHub
parent 9bbca07943 81a104690d
commit 945c26d027
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl
View File

@ -990,9 +990,7 @@ t_write_failure(Config) ->
?assertMatch([_ | _], Trace),
[#{result := Result} | _] = Trace,
?assert(
{error, {error, {closed, "The connection was lost."}}} =:= Result orelse
{error, {error, closed}} =:= Result orelse
{error, {recoverable_error, econnrefused}} =:= Result,
not emqx_ee_connector_influxdb:is_unrecoverable_error(Result),
#{got => Result}
);
async ->
@ -1000,11 +998,7 @@ t_write_failure(Config) ->
?assertMatch([#{action := nack} | _], Trace),
[#{result := Result} | _] = Trace,
?assert(
{error, {recoverable_error, {closed, "The connection was lost."}}} =:=
Result orelse
{error, {error, closed}} =:= Result orelse
{error, {recoverable_error, econnrefused}} =:= Result orelse
{error, {recoverable_error, noproc}} =:= Result,
not emqx_ee_connector_influxdb:is_unrecoverable_error(Result),
#{got => Result}
)
end,

9
lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl
View File

@ -35,6 +35,9 @@
desc/1
]).
%% only for test
-export([is_unrecoverable_error/1]).
-type ts_precision() :: ns | us | ms | s.
%% influxdb servers don't need parse
@ -655,12 +658,6 @@ str(S) when is_list(S) ->
is_unrecoverable_error({error, {unrecoverable_error, _}}) ->
true;
is_unrecoverable_error({error, {recoverable_error, _}}) ->
false;
is_unrecoverable_error({error, {error, econnrefused}}) ->
false;
is_unrecoverable_error({error, econnrefused}) ->
false;
is_unrecoverable_error(_) ->
false.