diff --git a/apps/emqx/include/asserts.hrl b/apps/emqx/include/asserts.hrl index 0e9f9477a..b3415fdf7 100644 --- a/apps/emqx/include/asserts.hrl +++ b/apps/emqx/include/asserts.hrl @@ -36,3 +36,17 @@ end ) ). + +-define(assertInclude(Pattern, List), + ?assert( + lists:any( + fun(El) -> + case El of + Pattern -> true; + _ -> false + end + end, + List + ) + ) +). diff --git a/apps/emqx_ft/docker-ct b/apps/emqx_ft/docker-ct new file mode 100644 index 000000000..e69de29bb diff --git a/apps/emqx_ft/test/emqx_ft_SUITE.erl b/apps/emqx_ft/test/emqx_ft_SUITE.erl index 0ca298265..5b01c33cd 100644 --- a/apps/emqx_ft/test/emqx_ft_SUITE.erl +++ b/apps/emqx_ft/test/emqx_ft_SUITE.erl @@ -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. diff --git a/apps/emqx_ft/test/emqx_ft_api_SUITE.erl b/apps/emqx_ft/test/emqx_ft_api_SUITE.erl index e420dac36..d38301a0f 100644 --- a/apps/emqx_ft/test/emqx_ft_api_SUITE.erl +++ b/apps/emqx_ft/test/emqx_ft_api_SUITE.erl @@ -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]). diff --git a/apps/emqx_ft/test/emqx_ft_storage_fs_SUITE.erl b/apps/emqx_ft/test/emqx_ft_storage_fs_SUITE.erl index 55f30300f..d19d9c764 100644 --- a/apps/emqx_ft/test/emqx_ft_storage_fs_SUITE.erl +++ b/apps/emqx_ft/test/emqx_ft_storage_fs_SUITE.erl @@ -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.