Skip to content

Commit e1acf33

Browse files
authored
chore: use RateCounterHelper.tick! to avoid waiting on tests (#1650)
1 parent 8f664f7 commit e1acf33

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

test/realtime/extensions/cdc_rls/subscriptions_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule Realtime.Extensions.PostgresCdcRls.Subscriptions do
1+
defmodule Realtime.Extensions.PostgresCdcRls.SubscriptionsTest do
22
use RealtimeWeb.ChannelCase, async: true
33

44
doctest Extensions.PostgresCdcRls.Subscriptions, import: true

test/realtime_web/channels/realtime_channel/broadcast_handler_test.exs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,14 +363,13 @@ defmodule RealtimeWeb.RealtimeChannel.BroadcastHandlerTest do
363363
capture_log(fn ->
364364
{:noreply, _socket} = BroadcastHandler.handle(%{}, db_conn, socket)
365365

366-
# Enough for the RateCounter to calculate the last bucket
367-
refute_receive _, 1200
366+
{:ok, %{avg: avg}} = RateCounterHelper.tick!(Tenants.events_per_second_rate(tenant))
367+
assert avg == 0.0
368+
369+
refute_receive _, 200
368370
end)
369371

370372
assert log =~ "RlsPolicyError"
371-
372-
{:ok, %{avg: avg}} = RateCounterHelper.tick!(Tenants.events_per_second_rate(tenant))
373-
assert avg == 0.0
374373
end
375374

376375
test "handle payload size excedding limits in private channels", %{topic: topic, tenant: tenant, db_conn: db_conn} do

test/realtime_web/channels/realtime_channel/presence_handler_test.exs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,8 @@ defmodule RealtimeWeb.RealtimeChannel.PresenceHandlerTest do
438438
log =
439439
capture_log(fn ->
440440
for _ <- 1..300, do: PresenceHandler.handle(%{"event" => "track"}, db_conn, socket)
441-
Process.sleep(1100)
441+
442+
{:ok, _} = RateCounterHelper.tick!(Tenants.presence_events_per_second_rate(tenant))
442443

443444
assert {:error, :rate_limit_exceeded} = PresenceHandler.handle(%{"event" => "track"}, db_conn, socket)
444445
end)
@@ -453,7 +454,8 @@ defmodule RealtimeWeb.RealtimeChannel.PresenceHandlerTest do
453454
log =
454455
capture_log(fn ->
455456
for _ <- 1..300, do: PresenceHandler.handle(%{"event" => "track"}, db_conn, socket)
456-
Process.sleep(1100)
457+
458+
{:ok, _} = RateCounterHelper.tick!(Tenants.presence_events_per_second_rate(tenant))
457459

458460
assert {:error, :rate_limit_exceeded} = PresenceHandler.handle(%{"event" => "track"}, db_conn, socket)
459461
end)
@@ -521,7 +523,8 @@ defmodule RealtimeWeb.RealtimeChannel.PresenceHandlerTest do
521523
log =
522524
capture_log(fn ->
523525
for _ <- 1..300, do: PresenceHandler.handle(%{"event" => "track"}, db_conn, socket)
524-
Process.sleep(1100)
526+
527+
{:ok, _} = RateCounterHelper.tick!(Tenants.presence_events_per_second_rate(tenant))
525528

526529
assert {:error, :rate_limit_exceeded} = PresenceHandler.handle(%{"event" => "track"}, db_conn, socket)
527530
end)
@@ -537,7 +540,8 @@ defmodule RealtimeWeb.RealtimeChannel.PresenceHandlerTest do
537540
log =
538541
capture_log(fn ->
539542
for _ <- 1..300, do: PresenceHandler.handle(%{"event" => "track"}, db_conn, socket)
540-
Process.sleep(1100)
543+
544+
{:ok, _} = RateCounterHelper.tick!(Tenants.presence_events_per_second_rate(tenant))
541545

542546
assert {:error, :rate_limit_exceeded} = PresenceHandler.handle(%{"event" => "track"}, db_conn, socket)
543547
end)

0 commit comments

Comments
 (0)