Skip to content

Commit c4785ff

Browse files
committed
fix: partition removal tests
1 parent 1879c01 commit c4785ff

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

test/realtime/messages_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ defmodule Realtime.MessagesTest do
192192
to_keep =
193193
Enum.reject(
194194
messages,
195-
&(NaiveDateTime.compare(limit, &1.inserted_at) == :gt)
195+
&(NaiveDateTime.compare(NaiveDateTime.beginning_of_day(limit), &1.inserted_at) == :gt)
196196
)
197197

198198
assert :ok = Messages.delete_old_messages(conn)

test/realtime/tenants/janitor/maintenance_task_test.exs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@ defmodule Realtime.Tenants.Janitor.MaintenanceTaskTest do
1515
end
1616

1717
test "cleans messages older than 72 hours and creates partitions", %{tenant: tenant} do
18+
{:ok, conn} = Database.connect(tenant, "realtime_test", :stop)
19+
1820
utc_now = NaiveDateTime.utc_now()
1921
limit = NaiveDateTime.add(utc_now, -72, :hour)
2022

23+
date_start = Date.utc_today() |> Date.add(-10)
24+
date_end = Date.utc_today()
25+
create_messages_partitions(conn, date_start, date_end)
26+
2127
messages =
2228
for days <- -5..0 do
2329
inserted_at = NaiveDateTime.add(utc_now, days, :day)
@@ -27,12 +33,11 @@ defmodule Realtime.Tenants.Janitor.MaintenanceTaskTest do
2733

2834
to_keep =
2935
messages
30-
|> Enum.reject(&(NaiveDateTime.compare(limit, &1.inserted_at) == :gt))
36+
|> Enum.reject(&(NaiveDateTime.compare(NaiveDateTime.beginning_of_day(limit), &1.inserted_at) == :gt))
3137
|> MapSet.new()
3238

3339
assert MaintenanceTask.run(tenant.external_id) == :ok
3440

35-
{:ok, conn} = Database.connect(tenant, "realtime_test", :stop)
3641
{:ok, res} = Repo.all(conn, from(m in Message), Message)
3742

3843
verify_partitions(conn)
@@ -80,7 +85,7 @@ defmodule Realtime.Tenants.Janitor.MaintenanceTaskTest do
8085

8186
defp verify_partitions(conn) do
8287
today = Date.utc_today()
83-
yesterday = Date.add(today, -1)
88+
yesterday = Date.add(today, -3)
8489
future = Date.add(today, 3)
8590
dates = Date.range(yesterday, future)
8691

test/realtime/tenants/janitor_test.exs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ defmodule Realtime.Tenants.JanitorTest do
3131
end
3232
)
3333

34+
date_start = Date.utc_today() |> Date.add(-10)
35+
date_end = Date.utc_today()
36+
37+
Enum.map(tenants, fn tenant ->
38+
{:ok, conn} = Database.connect(tenant, "realtime_test", :stop)
39+
create_messages_partitions(conn, date_start, date_end)
40+
end)
41+
3442
start_supervised!(
3543
{Task.Supervisor,
3644
name: Realtime.Tenants.Janitor.TaskSupervisor, max_children: 5, max_seconds: 500, max_restarts: 1}
@@ -62,7 +70,7 @@ defmodule Realtime.Tenants.JanitorTest do
6270

6371
to_keep =
6472
messages
65-
|> Enum.reject(&(NaiveDateTime.compare(limit, &1.inserted_at) == :gt))
73+
|> Enum.reject(&(NaiveDateTime.compare(NaiveDateTime.beginning_of_day(limit), &1.inserted_at) == :gt))
6674
|> MapSet.new()
6775

6876
start_supervised!(Janitor)
@@ -105,7 +113,7 @@ defmodule Realtime.Tenants.JanitorTest do
105113

106114
to_keep =
107115
messages
108-
|> Enum.reject(&(NaiveDateTime.compare(limit, &1.inserted_at) == :gt))
116+
|> Enum.reject(&(NaiveDateTime.compare(NaiveDateTime.beginning_of_day(limit), &1.inserted_at) == :gt))
109117
|> MapSet.new()
110118

111119
start_supervised!(Janitor)
@@ -162,7 +170,7 @@ defmodule Realtime.Tenants.JanitorTest do
162170

163171
defp verify_partitions(conn) do
164172
today = Date.utc_today()
165-
yesterday = Date.add(today, -1)
173+
yesterday = Date.add(today, -3)
166174
future = Date.add(today, 3)
167175
dates = Date.range(yesterday, future)
168176

0 commit comments

Comments
 (0)