Merge pull request #4286 from esl/instrument/fix_slow_mam_test

Fix slow MAM muc_prefs_cases tests
esl · May 22, 2024 · 02359b1 · 02359b1
2 parents cd92518 + 41863b7
commit 02359b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/big_tests/tests/mam_SUITE.erl b/big_tests/tests/mam_SUITE.erl
@@ -3573,6 +3573,13 @@ muc_run_prefs_cases(DefaultPolicy, ConfigIn) ->
     F = fun(Config, Alice, Bob, Kate) ->
         %% Just send messages for each prefs configuration
         Namespace = mam_ns_binary_v04(),
+
+        Room = ?config(room, Config),
+        escalus:send(Alice, stanza_muc_enter_room(Room, nick(Alice))),
+        escalus:send(Bob, stanza_muc_enter_room(Room, nick(Bob))),
+        escalus:send(Kate, stanza_muc_enter_room(Room, nick(Kate))),
+        escalus:wait_for_stanzas(Alice, 4),
+
         Funs = [muc_run_prefs_case(Case, Namespace, Alice, Bob, Kate, Config)
                 || Case <- prefs_cases2_muc(),
                 default_policy(Case) =:= DefaultPolicy],

diff --git a/big_tests/tests/mam_helper.erl b/big_tests/tests/mam_helper.erl
@@ -1261,10 +1261,6 @@ run_prefs_case({PrefsState, ExpectedMessageStates}, Namespace, Alice, Bob, Kate,
 muc_run_prefs_case({PrefsState, ExpectedMessageStates}, Namespace, Alice, Bob, Kate, Config) ->
     Room = ?config(room, Config),
     RoomAddr = room_address(Room),
-    escalus:send(Alice, stanza_muc_enter_room(Room, nick(Alice))),
-    escalus:send(Bob, stanza_muc_enter_room(Room, nick(Bob))),
-    escalus:send(Kate, stanza_muc_enter_room(Room, nick(Kate))),
-    escalus:wait_for_stanzas(Alice, 4),
 
     {DefaultMode, AlwaysUsers, NeverUsers} = PrefsState,
     IqSet = stanza_prefs_set_request_muc({DefaultMode, AlwaysUsers, NeverUsers, Namespace}, Config),