Bladeren bron

feat(ft): fix test for CI

Ilya Averyanov 3 jaren geleden
bovenliggende
commit
bc0a15afd7

+ 14 - 0
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
+        )
+    )
+).

+ 0 - 0
apps/emqx_ft/docker-ct


+ 1 - 1
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.

+ 1 - 13
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]).
 

+ 2 - 14
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.