Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

test(gateway): keep the recheck timer out of the eunit process (#3304)

Hampus0ec1cee99eb2
diff --git a/fluxer_gateway/src/guild/guild_availability.erl b/fluxer_gateway/src/guild/guild_availability.erl
index fe368985c..5e6b1b343 100644
--- a/fluxer_gateway/src/guild/guild_availability.erl
+++ b/fluxer_gateway/src/guild/guild_availability.erl
@@ -269,8 +269,16 @@ schedule_availability_recheck_available_no_timer_test() ->
schedule_availability_recheck_unavailable_sets_timer_test() ->
State = #{data => #{<<"guild">> => #{<<"features">> => [<<"UNAVAILABLE_FOR_EVERYONE">>]}}},
- Result = schedule_availability_recheck(State),
- ?assertEqual(State, Result).
+ Parent = self(),
+ {Pid, MonitorRef} = spawn_monitor(fun() ->
+ Parent ! {scheduled, self(), schedule_availability_recheck(State)}
+ end),
+ receive
+ {scheduled, Pid, Result} -> ?assertEqual(State, Result)
+ end,
+ receive
+ {'DOWN', MonitorRef, process, Pid, normal} -> ok
+ end.
handle_recheck_transition_clears_cache_on_recovery_test() ->
GuildId = 99001,
diff --git a/fluxer_gateway/src/guild/guild_subscription_handler.erl b/fluxer_gateway/src/guild/guild_subscription_handler.erl
index 0da4de60d..390c33046 100644
--- a/fluxer_gateway/src/guild/guild_subscription_handler.erl
+++ b/fluxer_gateway/src/guild/guild_subscription_handler.erl
@@ -777,7 +777,7 @@ reference_update_member_subscriptions(SessionId, MemberIds, State) ->
drain_mailbox(Acc) ->
receive
- Msg -> drain_mailbox([Msg | Acc])
+ {'$gen_cast', _} = Msg -> drain_mailbox([Msg | Acc])
after 50 -> lists:reverse(Acc)
end.