summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-10-19 23:20:38 +0000
committerkaniini <ariadne@dereferenced.org>2019-10-19 23:20:38 +0000
commit1311884a1d35fa091b850e3a4d310a8da29059da (patch)
tree4203782915925b21996c2d860ad150391e45a138
parentf01dbc450c658ac1a03b91b7ff3ba8d5ea1454e5 (diff)
parentcd90735a4b0dad01cca84d93b4fd671289e992b7 (diff)
downloadpleroma-1311884a1d35fa091b850e3a4d310a8da29059da.tar.gz
pleroma-1311884a1d35fa091b850e3a4d310a8da29059da.zip
Merge branch 'chore/fixup-testsuite-import' into 'develop'
tests: ostatus controller tests: fix sporadic compilation failure See merge request pleroma/pleroma!1867
-rw-r--r--test/web/ostatus/ostatus_controller_test.exs1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs
index 58534396e..37b7b62f5 100644
--- a/test/web/ostatus/ostatus_controller_test.exs
+++ b/test/web/ostatus/ostatus_controller_test.exs
@@ -5,7 +5,6 @@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
use Pleroma.Web.ConnCase
- import ExUnit.CaptureLog
import Pleroma.Factory
alias Pleroma.Object