pleroma

commit: 937d6c6b32fc735cb5a56d9a3d97a6b2e8f37f68
parent: 75efdb0781bcaf4b685dbba0d218cb158fc3fcaf
Author: lain <lain@soykaf.club>
Date:   Wed, 20 Nov 2019 12:46:33 +0000

Merge branch 'fix/sporadic-tests' into 'develop'

Fix sporadically failing test

Closes #1432

See merge request pleroma/pleroma!1999
Diffstat:
M
test/web/mastodon_api/controllers/filter_controller_test.exs
2
+-
M
test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/web/mastodon_api/controllers/filter_controller_test.exs b/test/web/mastodon_api/controllers/filter_controller_test.exs
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
-  use Pleroma.Web.ConnCase, async: true
+  use Pleroma.Web.ConnCase
 
   alias Pleroma.Web.MastodonAPI.FilterView
 
diff --git a/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs b/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do
-  use Pleroma.Web.ConnCase, async: true
+  use Pleroma.Web.ConnCase
 
   alias Pleroma.Repo
   alias Pleroma.ScheduledActivity