Implement clear_table function for tests

esl · Jul 31, 2023 · 660d2b0 · 660d2b0
1 parent 3c12479
commit 660d2b0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/big_tests/tests/mongoose_helper.erl b/big_tests/tests/mongoose_helper.erl
@@ -242,7 +242,8 @@ stop_online_rooms() ->
         false -> ct:fail({ejabberd_mod_muc_sup_not_found, Supervisor, HostType})
     end,
     rpc(mim(), erlang, exit, [SupervisorPid, kill]),
-    rpc(mim(), mnesia, clear_table, [muc_online_room]),
+    %% That's a pretty dirty way
+    rpc(mim(), mongoose_muc_online_backend, clear_table, [HostType]),
     ok.
 
 forget_persistent_rooms() ->

diff --git a/src/muc/mongoose_muc_online_backend.erl b/src/muc/mongoose_muc_online_backend.erl
@@ -5,7 +5,8 @@
          room_destroyed/4,
          find_room_pid/3,
          get_online_rooms/2,
-         node_cleanup/2]).
+         node_cleanup/2,
+         clear_table/1]).
 
 -define(MAIN_MODULE, mongoose_muc_online).
 
@@ -29,6 +30,8 @@
 
 -callback node_cleanup(mongooseim:host_type(), node()) -> ok.
 
+-callback clear_table(mongooseim:host_type()) -> ok.
+
 %% API Functions
 
 -spec start(mongooseim:host_type(), gen_mod:module_opts()) -> any().
@@ -72,3 +75,6 @@ get_online_rooms(HostType, MucHost) ->
 node_cleanup(HostType, Node) ->
     Args = [HostType, Node],
     mongoose_backend:call_tracked(HostType, ?MAIN_MODULE, ?FUNCTION_NAME, Args).
+
+clear_table(HostType) ->
+    mongoose_backend:call(HostType, ?MAIN_MODULE, ?FUNCTION_NAME, [HostType]).
diff --git a/src/muc/mongoose_muc_online_cets.erl b/src/muc/mongoose_muc_online_cets.erl
@@ -6,7 +6,8 @@
          room_destroyed/4,
          find_room_pid/3,
          get_online_rooms/2,
-         node_cleanup/2]).
+         node_cleanup/2,
+         clear_table/1]).
 
 -export([handle_conflict/2]).
 
@@ -101,3 +102,12 @@ node_cleanup(HostType, Node) ->
     Guard = {'==', {node, '$1'}, Node},
     ets:select_delete(Tab, [{Pattern, [Guard], [true]}]),
     ok.
+
+%% Clear table for tests
+-spec clear_table(mongooseim:host_type()) -> ok.
+clear_table(HostType) ->
+    Tab = table_name(HostType),
+    ets:match_delete(Tab, '_'),
+    Nodes = cets:other_nodes(Tab),
+    [rpc:call(Node, ets, match_delete, [Tab, '_']) || Node <- Nodes],
+    ok.
diff --git a/src/muc/mongoose_muc_online_mnesia.erl b/src/muc/mongoose_muc_online_mnesia.erl
@@ -6,7 +6,8 @@
          room_destroyed/4,
          find_room_pid/3,
          get_online_rooms/2,
-         node_cleanup/2]).
+         node_cleanup/2,
+         clear_table/1]).
 
 -include_lib("mod_muc.hrl").
 
@@ -85,3 +86,9 @@ node_cleanup(HostType, Node) ->
         end,
     mnesia:async_dirty(F),
     ok.
+
+%% Clear table for tests
+-spec clear_table(mongooseim:host_type()) -> ok.
+clear_table(_HostType) ->
+    mnesia:clear_table(muc_online_room),
+    ok.