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

test: fix flaky influxdb test
emqx · Mar 31, 2023 · 945c26d · 945c26d
2 parents 9bbca07 + 81a1046
commit 945c26d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_influxdb_SUITE.erl
@@ -990,21 +990,15 @@ 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 ->
                     Trace = ?of_kind(handle_async_reply, Trace0),
                     ?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,

diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_influxdb.erl
@@ -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.