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

Search tests: Use on_exit for restoring persistent_term state

Browse Source 
Otherwise if the assertion failed, the code below which resets the
state would never be reached
This commit is contained in:
rinpatch 2020-12-01 19:45:25 +03:00
parent 5a5ff508aa
commit fc9ebe5073
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/pleroma/activity/search_test.exs
View File

@ -21,6 +21,7 @@ defmodule Pleroma.Activity.SearchTest do
test "using plainto_tsquery on postgres < 11" do test "using plainto_tsquery on postgres < 11" do
old_version = :persistent_term.get({Pleroma.Repo, :postgres_version}) old_version = :persistent_term.get({Pleroma.Repo, :postgres_version})
:persistent_term.put({Pleroma.Repo, :postgres_version}, 10.0) :persistent_term.put({Pleroma.Repo, :postgres_version}, 10.0)
on_exit(fn -> :persistent_term.put({Pleroma.Repo, :postgres_version}, old_version) end)
user = insert(:user) user = insert(:user)
{:ok, post} = CommonAPI.post(user, %{status: "it's wednesday my dudes"}) {:ok, post} = CommonAPI.post(user, %{status: "it's wednesday my dudes"})
@ -30,8 +31,6 @@ defmodule Pleroma.Activity.SearchTest do
assert [result] = Search.search(nil, "wednesday -dudes") assert [result] = Search.search(nil, "wednesday -dudes")
assert result.id == post.id assert result.id == post.id
:persistent_term.put({Pleroma.Repo, :postgres_version}, old_version)
end end
test "using websearch_to_tsquery" do test "using websearch_to_tsquery" do

3
test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
View File

@ -281,6 +281,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
test "search fetches remote statuses and prefers them over other results", %{conn: conn} do test "search fetches remote statuses and prefers them over other results", %{conn: conn} do
old_version = :persistent_term.get({Pleroma.Repo, :postgres_version}) old_version = :persistent_term.get({Pleroma.Repo, :postgres_version})
:persistent_term.put({Pleroma.Repo, :postgres_version}, 10.0) :persistent_term.put({Pleroma.Repo, :postgres_version}, 10.0)
on_exit(fn -> :persistent_term.put({Pleroma.Repo, :postgres_version}, old_version) end)
capture_log(fn -> capture_log(fn ->
{:ok, %{id: activity_id}} = {:ok, %{id: activity_id}} =
@ -298,8 +299,6 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
%{"id" => ^activity_id} %{"id" => ^activity_id}
] = results["statuses"] ] = results["statuses"]
end) end)
:persistent_term.put({Pleroma.Repo, :postgres_version}, old_version)
end end
test "search doesn't show statuses that it shouldn't", %{conn: conn} do test "search doesn't show statuses that it shouldn't", %{conn: conn} do