Init metrics in a separate step

esl · Mar 7, 2024 · fabb86f · fabb86f
1 parent 78d13ca
commit fabb86f
Showing 1 changed file with 28 additions and 29 deletions.
diff --git a/big_tests/tests/mam_SUITE.erl b/big_tests/tests/mam_SUITE.erl
@@ -695,43 +695,19 @@ end_state(C, muc_light, Config) ->
 end_state(_, _, Config) ->
     Config.
 
-init_per_testcase_extra(C=metric_incremented_when_store_message, ConfigIn) ->
-    Config = case ?config(configuration, ConfigIn) of
-                 rdbms_async_pool ->
-                     MongooseMetrics = [
-                                        {[global, data, rdbms, default],
-                                         [{recv_oct, '>'}, {send_oct, '>'}]}
-                                       ],
-                     [{mongoose_metrics, MongooseMetrics} | ConfigIn];
-                 _ ->
-                     ConfigIn
-             end,
-    escalus:init_per_testcase(C, Config);
-init_per_testcase_extra(C=muc_archive_request, Config) ->
-    Config1 = %% Check that metric is incremented on MUC flushed
-        case ?config(configuration, Config) of
-            rdbms_async_pool ->
-                MongooseMetrics = [{['_', 'modMucMamFlushed'], changed}],
-                [{mongoose_metrics, MongooseMetrics} | Config];
-            _ ->
-                Config
-        end,
-    escalus:init_per_testcase(C, Config1);
-init_per_testcase_extra(CaseName, Config) ->
-    escalus:init_per_testcase(CaseName, Config).
-
 init_per_testcase(CaseName, Config) ->
     case maybe_skip(CaseName, Config) of
         ok ->
             dynamic_modules:ensure_modules(host_type(), required_modules(CaseName, Config)),
-            Config1 = init_users(CaseName, Config),
-            Config2 = init_archive(CaseName, Config1),
-            Config3 = start_rooms(CaseName, Config2),
-            init_per_testcase_extra(CaseName, Config3);
+            lists:foldl(fun(StepF, ConfigIn) -> StepF(CaseName, ConfigIn) end, Config, init_steps());
         {skip, Msg} ->
             {skip, Msg}
     end.
 
+init_steps() ->
+    [fun init_users/2, fun init_archive/2, fun start_rooms/2, fun init_metrics/2,
+     fun escalus:init_per_testcase/2].
+
 maybe_skip(metrics_incremented_for_async_pools, Config) ->
     skip_if(?config(configuration, Config) =/= rdbms_async_pool,
             "Not an async-pool test");
@@ -875,6 +851,29 @@ start_rooms(C, Config) when C =:= muc_archive_request;
 start_rooms(_CaseName, Config) ->
     Config.
 
+init_metrics(metric_incremented_when_store_message, ConfigIn) ->
+    case ?config(configuration, ConfigIn) of
+        rdbms_async_pool ->
+            MongooseMetrics = [
+                               {[global, data, rdbms, default],
+                                [{recv_oct, '>'}, {send_oct, '>'}]}
+                              ],
+            [{mongoose_metrics, MongooseMetrics} | ConfigIn];
+        _ ->
+            ConfigIn
+    end;
+init_metrics(muc_archive_request, Config) ->
+    %% Check that metric is incremented on MUC flushed
+    case ?config(configuration, Config) of
+        rdbms_async_pool ->
+            MongooseMetrics = [{['_', 'modMucMamFlushed'], changed}],
+            [{mongoose_metrics, MongooseMetrics} | Config];
+        _ ->
+            Config
+    end;
+init_metrics(_CaseName, Config) ->
+    Config.
+
 end_per_testcase(C=muc_text_search_request, Config) ->
     destroy_room(Config),
     escalus:end_per_testcase(C, Config);