logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 74eba5afe20124646366aace98c2e1b106712108
parent: 2990c0a53b14646eab19b57d068ac8aa7e17ea4e
Author: kaniini <ariadne@dereferenced.org>
Date:   Mon, 16 Sep 2019 07:36:57 +0000

Merge branch 'fix/race-in-tests' into 'develop'

Fix a race condition in tests

See merge request pleroma/pleroma!1673

Diffstat:

Mtest/web/mastodon_api/mastodon_api_controller_test.exs2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -752,7 +752,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do query_string = "ids[]=#{id1}&ids[]=#{id2}" conn = get(conn, "/api/v1/statuses/?#{query_string}") - assert [%{"id" => ^id1}, %{"id" => ^id2}] = json_response(conn, :ok) + assert [%{"id" => ^id1}, %{"id" => ^id2}] = Enum.sort_by(json_response(conn, :ok), & &1["id"]) end describe "deleting a status" do