feat(ft): fix test for CI
This commit is contained in:
parent
16fa55e19a
commit
bc0a15afd7
|
@ -36,3 +36,17 @@
|
||||||
end
|
end
|
||||||
)
|
)
|
||||||
).
|
).
|
||||||
|
|
||||||
|
-define(assertInclude(Pattern, List),
|
||||||
|
?assert(
|
||||||
|
lists:any(
|
||||||
|
fun(El) ->
|
||||||
|
case El of
|
||||||
|
Pattern -> true;
|
||||||
|
_ -> false
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
List
|
||||||
|
)
|
||||||
|
)
|
||||||
|
).
|
||||||
|
|
|
@ -71,7 +71,7 @@ end_per_testcase(_Case, Config) ->
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
init_per_group(cluster, Config) ->
|
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];
|
[{additional_node, Node} | Config];
|
||||||
init_per_group(_Group, Config) ->
|
init_per_group(_Group, Config) ->
|
||||||
Config.
|
Config.
|
||||||
|
|
|
@ -22,19 +22,7 @@
|
||||||
-include_lib("common_test/include/ct.hrl").
|
-include_lib("common_test/include/ct.hrl").
|
||||||
-include_lib("stdlib/include/assert.hrl").
|
-include_lib("stdlib/include/assert.hrl").
|
||||||
|
|
||||||
-define(assertInclude(Pattern, List),
|
-include_lib("emqx/include/asserts.hrl").
|
||||||
?assert(
|
|
||||||
lists:any(
|
|
||||||
fun(El) ->
|
|
||||||
case El of
|
|
||||||
Pattern -> true;
|
|
||||||
_ -> false
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
List
|
|
||||||
)
|
|
||||||
)
|
|
||||||
).
|
|
||||||
|
|
||||||
-import(emqx_mgmt_api_test_util, [request/3, uri/1]).
|
-import(emqx_mgmt_api_test_util, [request/3, uri/1]).
|
||||||
|
|
||||||
|
|
|
@ -22,19 +22,7 @@
|
||||||
-include_lib("common_test/include/ct.hrl").
|
-include_lib("common_test/include/ct.hrl").
|
||||||
-include_lib("stdlib/include/assert.hrl").
|
-include_lib("stdlib/include/assert.hrl").
|
||||||
|
|
||||||
-define(assertInclude(Pattern, List),
|
-include_lib("emqx/include/asserts.hrl").
|
||||||
?assert(
|
|
||||||
lists:any(
|
|
||||||
fun(El) ->
|
|
||||||
case El of
|
|
||||||
Pattern -> true;
|
|
||||||
_ -> false
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
List
|
|
||||||
)
|
|
||||||
)
|
|
||||||
).
|
|
||||||
|
|
||||||
all() ->
|
all() ->
|
||||||
[
|
[
|
||||||
|
@ -74,7 +62,7 @@ end_per_testcase(_Case, _Config) ->
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
init_per_group(cluster, Config) ->
|
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];
|
[{additional_node, Node} | Config];
|
||||||
init_per_group(_Group, Config) ->
|
init_per_group(_Group, Config) ->
|
||||||
Config.
|
Config.
|
||||||
|
|
Loading…
Reference in New Issue