mirror of
https://github.com/philomena-dev/philomena.git
synced 2025-02-23 21:54:33 +01:00
Adds retry mechanism to prevent flakiness.
This commit is contained in:
parent
b3492b4459
commit
5e082e2abd
3 changed files with 32 additions and 4 deletions
|
@ -1,4 +1,6 @@
|
||||||
defmodule PhilomenaWeb.DeactivationControllerTest do
|
defmodule PhilomenaWeb.DeactivationControllerTest do
|
||||||
|
import Philomena.TestUtilities
|
||||||
|
|
||||||
use PhilomenaWeb.ConnCase, async: true
|
use PhilomenaWeb.ConnCase, async: true
|
||||||
|
|
||||||
alias Swoosh.Adapters.Local.Storage.Memory
|
alias Swoosh.Adapters.Local.Storage.Memory
|
||||||
|
@ -24,8 +26,10 @@ defmodule PhilomenaWeb.DeactivationControllerTest do
|
||||||
assert Memory.all()
|
assert Memory.all()
|
||||||
|> Enum.find(&(&1.subject == "Reactivation instructions for your account")) != nil
|
|> Enum.find(&(&1.subject == "Reactivation instructions for your account")) != nil
|
||||||
|
|
||||||
user = Users.get_user!(user.id)
|
assert_retry(fn ->
|
||||||
assert user.deleted_by_user_id == user.id
|
user = Users.get_user!(user.id)
|
||||||
|
user.deleted_by_user_id == user.id
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
defmodule PhilomenaWeb.ReactivationControllerTest do
|
defmodule PhilomenaWeb.ReactivationControllerTest do
|
||||||
use PhilomenaWeb.ConnCase, async: true
|
use PhilomenaWeb.ConnCase, async: true
|
||||||
|
import Philomena.TestUtilities
|
||||||
|
|
||||||
alias Swoosh.Adapters.Local.Storage.Memory
|
alias Swoosh.Adapters.Local.Storage.Memory
|
||||||
alias Philomena.Users
|
alias Philomena.Users
|
||||||
|
@ -33,8 +34,10 @@ defmodule PhilomenaWeb.ReactivationControllerTest do
|
||||||
conn = post(conn, url, %{"token" => token})
|
conn = post(conn, url, %{"token" => token})
|
||||||
assert redirected_to(conn) == ~p"/"
|
assert redirected_to(conn) == ~p"/"
|
||||||
|
|
||||||
user = Users.get_user!(user.id)
|
assert_retry(fn ->
|
||||||
assert user.deleted_by_user_id == nil
|
user = Users.get_user!(user.id)
|
||||||
|
user.deleted_by_user_id == nil
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
21
test/support/utilities.ex
Normal file
21
test/support/utilities.ex
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
import ExUnit.Assertions
|
||||||
|
|
||||||
|
defmodule Philomena.TestUtilities do
|
||||||
|
defp assert_retry(_, attempts, max_retries, _) when attempts > max_retries, do: false
|
||||||
|
|
||||||
|
defp assert_retry(evalulation_lambda, attempts, max_retries, timeout_in_ms) do
|
||||||
|
case evalulation_lambda.() do
|
||||||
|
true ->
|
||||||
|
true
|
||||||
|
|
||||||
|
false ->
|
||||||
|
Process.sleep(timeout_in_ms)
|
||||||
|
assert_retry(evalulation_lambda, attempts + 1, max_retries, timeout_in_ms)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def assert_retry(evaluation_lambda, max_retries \\ 3, timeout_in_ms \\ 1000)
|
||||||
|
when is_function(evaluation_lambda) do
|
||||||
|
assert assert_retry(evaluation_lambda, 0, max_retries, timeout_in_ms)
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue