squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mox mode setup tweak; refactoring.

Browse Source
This commit is contained in:
Ivan Tashkinov 2021-01-19 00:23:39 +03:00
parent 958a7f6ed0
commit 318d6dde1c
4 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/pleroma/gun/connection_pool_test.exs
View File

@ -19,7 +19,6 @@ defmodule Pleroma.Gun.ConnectionPoolTest do
:ok :ok
end end
setup :set_mox_from_context
setup :gun_mock setup :gun_mock
test "gives the same connection to 2 concurrent requests" do test "gives the same connection to 2 concurrent requests" do

16
test/support/channel_case.ex
View File

@ -30,19 +30,5 @@ defmodule Pleroma.Web.ChannelCase do
end end
end end
setup tags do setup tags, do: Pleroma.DataCase.setup_multi_process_mode(tags)
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
if tags[:async] do
Mox.stub_with(Pleroma.CachexMock, Pleroma.NullCache)
Mox.set_mox_private()
else
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
Mox.set_mox_global()
Pleroma.DataCase.clear_cachex()
end
:ok
end
end end

26
test/support/conn_case.ex
View File

@ -19,6 +19,8 @@ defmodule Pleroma.Web.ConnCase do
use ExUnit.CaseTemplate use ExUnit.CaseTemplate
alias Pleroma.DataCase
using do using do
quote do quote do
# Import conveniences for testing with connections # Import conveniences for testing with connections
@ -116,27 +118,9 @@ defmodule Pleroma.Web.ConnCase do
end end
setup tags do setup tags do
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo) DataCase.setup_multi_process_mode(tags)
DataCase.setup_streamer(tags)
if tags[:async] do DataCase.stub_pipeline()
Mox.stub_with(Pleroma.CachexMock, Pleroma.NullCache)
Mox.set_mox_private()
else
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
Mox.set_mox_global()
Pleroma.DataCase.clear_cachex()
end
if tags[:needs_streamer] do
start_supervised(%{
id: Pleroma.Web.Streamer.registry(),
start:
{Registry, :start_link, [[keys: :duplicate, name: Pleroma.Web.Streamer.registry()]]}
})
end
Pleroma.DataCase.stub_pipeline()
Mox.verify_on_exit!() Mox.verify_on_exit!()

15
test/support/data_case.ex
View File

@ -62,7 +62,7 @@ defmodule Pleroma.DataCase do
end) end)
end end
setup tags do def setup_multi_process_mode(tags) do
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo) :ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
if tags[:async] do if tags[:async] do
@ -70,11 +70,16 @@ defmodule Pleroma.DataCase do
Mox.set_mox_private() Mox.set_mox_private()
else else
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()}) Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
Mox.set_mox_global() Mox.set_mox_global()
Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
clear_cachex() clear_cachex()
end end
:ok
end
def setup_streamer(tags) do
if tags[:needs_streamer] do if tags[:needs_streamer] do
start_supervised(%{ start_supervised(%{
id: Pleroma.Web.Streamer.registry(), id: Pleroma.Web.Streamer.registry(),
@ -83,6 +88,12 @@ defmodule Pleroma.DataCase do
}) })
end end
:ok
end
setup tags do
setup_multi_process_mode(tags)
setup_streamer(tags)
stub_pipeline() stub_pipeline()
Mox.verify_on_exit!() Mox.verify_on_exit!()