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

feat(ft): fix test for CI

This commit is contained in:
Ilya Averyanov 2023-02-16 00:28:32 +02:00
parent 16fa55e19a
commit bc0a15afd7
5 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/emqx/include/asserts.hrl
View File

@ -36,3 +36,17 @@
end
)
).
-define(assertInclude(Pattern, List),
?assert(
lists:any(
fun(El) ->
case El of
Pattern -> true;
_ -> false
end
end,
List
)
)
).

0
apps/emqx_ft/docker-ct Normal file
View File

2
apps/emqx_ft/test/emqx_ft_SUITE.erl
View File

@ -71,7 +71,7 @@ end_per_testcase(_Case, Config) ->
ok.
init_per_group(cluster, Config) ->
Node = emqx_ft_test_helpers:start_additional_node(Config, test2),
Node = emqx_ft_test_helpers:start_additional_node(Config, emqx_ft1),
[{additional_node, Node} | Config];
init_per_group(_Group, Config) ->
Config.

14
apps/emqx_ft/test/emqx_ft_api_SUITE.erl
View File

@ -22,19 +22,7 @@
-include_lib("common_test/include/ct.hrl").
-include_lib("stdlib/include/assert.hrl").
-define(assertInclude(Pattern, List),
?assert(
lists:any(
fun(El) ->
case El of
Pattern -> true;
_ -> false
end
end,
List
)
)
).
-include_lib("emqx/include/asserts.hrl").
-import(emqx_mgmt_api_test_util, [request/3, uri/1]).

16
apps/emqx_ft/test/emqx_ft_storage_fs_SUITE.erl
View File

@ -22,19 +22,7 @@
-include_lib("common_test/include/ct.hrl").
-include_lib("stdlib/include/assert.hrl").
-define(assertInclude(Pattern, List),
?assert(
lists:any(
fun(El) ->
case El of
Pattern -> true;
_ -> false
end
end,
List
)
)
).
-include_lib("emqx/include/asserts.hrl").
all() ->
[
@ -74,7 +62,7 @@ end_per_testcase(_Case, _Config) ->
ok.
init_per_group(cluster, Config) ->
Node = emqx_ft_test_helpers:start_additional_node(Config, test2),
Node = emqx_ft_test_helpers:start_additional_node(Config, emqx_ft_storage_fs1),
[{additional_node, Node} | Config];
init_per_group(_Group, Config) ->
Config.