logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 9983799ccb19585ad8ed0de2546d71090b094277
parent 263b42a73d4834da0a8d80546ce2412861150e63
Author: Alex Gleason <alex@alexgleason.me>
Date:   Sat, 22 Jan 2022 20:09:09 +0000

Merge branch 'less_erratic_expiration_test' into 'develop'

Make test less erratic by adding five second tolerance

See merge request pleroma/pleroma!3614

Diffstat:

Mtest/pleroma/web/mastodon_api/controllers/filter_controller_test.exs8++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/pleroma/web/mastodon_api/controllers/filter_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/filter_controller_test.exs @@ -49,7 +49,6 @@ defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do assert filter.hide == true end - @tag :erratic test "a filter with expires_in", %{conn: conn, user: user} do in_seconds = 600 @@ -65,12 +64,13 @@ defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do assert response["irreversible"] == false - expires_at = + expected_expiration = NaiveDateTime.utc_now() |> NaiveDateTime.add(in_seconds) - |> Pleroma.Web.CommonAPI.Utils.to_masto_date() - assert response["expires_at"] == expires_at + {:ok, actual_expiration} = NaiveDateTime.from_iso8601(response["expires_at"]) + + assert abs(NaiveDateTime.diff(expected_expiration, actual_expiration)) <= 5 filter = Filter.get(response["id"], user)