summaryrefslogtreecommitdiff
path: root/restarter
diff options
context:
space:
mode:
authortusooa <tusooa@kazv.moe>2022-08-25 18:38:18 +0000
committertusooa <tusooa@kazv.moe>2022-08-25 18:38:18 +0000
commit6811237ffdc181d40d99649bf8323dbf1b3bb8d9 (patch)
tree15aafa5cb3fe90898934e25515e642c78718021e /restarter
parent6f10f93d625474edb5746fb9580a920c2aa68286 (diff)
parentba31af021ca82c6eb9685e967749620d8b8a44d9 (diff)
downloadpleroma-6811237ffdc181d40d99649bf8323dbf1b3bb8d9.tar.gz
pleroma-6811237ffdc181d40d99649bf8323dbf1b3bb8d9.zip
Merge branch 'fix_flaky_transfer_task_test.exs' into 'develop'
Fix flaky/erratic test/pleroma/config/transfer_task_test.exs See merge request pleroma/pleroma!3703
Diffstat (limited to 'restarter')
-rw-r--r--restarter/lib/pleroma.ex12
-rw-r--r--restarter/mix.exs3
2 files changed, 14 insertions, 1 deletions
diff --git a/restarter/lib/pleroma.ex b/restarter/lib/pleroma.ex
index 149a569ce..a7186cec4 100644
--- a/restarter/lib/pleroma.ex
+++ b/restarter/lib/pleroma.ex
@@ -61,6 +61,12 @@ defmodule Restarter.Pleroma do
{:noreply, @init_state}
end
+ # Don't actually restart during tests.
+ # We just check if the correct call has been done.
+ # If we actually restart, we get errors during the tests like
+ # (RuntimeError) could not lookup Ecto repo Pleroma.Repo because it was not started or
+ # it does not exist
+ # See tests in Pleroma.Config.TransferTaskTest
def handle_cast({:restart, :test, _}, state) do
Logger.debug("pleroma manually restarted")
{:noreply, Map.put(state, :need_reboot, false)}
@@ -74,6 +80,12 @@ defmodule Restarter.Pleroma do
def handle_cast({:after_boot, _}, %{after_boot: true} = state), do: {:noreply, state}
+ # Don't actually restart during tests.
+ # We just check if the correct call has been done.
+ # If we actually restart, we get errors during the tests like
+ # (RuntimeError) could not lookup Ecto repo Pleroma.Repo because it was not started or
+ # it does not exist
+ # See tests in Pleroma.Config.TransferTaskTest
def handle_cast({:after_boot, :test}, state) do
Logger.debug("pleroma restarted after boot")
state = %{state | after_boot: true, rebooted: true}
diff --git a/restarter/mix.exs b/restarter/mix.exs
index b0908aece..9f26f5f64 100644
--- a/restarter/mix.exs
+++ b/restarter/mix.exs
@@ -13,7 +13,8 @@ defmodule Restarter.MixProject do
def application do
[
- mod: {Restarter, []}
+ mod: {Restarter, []},
+ extra_applications: [:logger]
]
end