summaryrefslogtreecommitdiff
path: root/test/web/streamer
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-03-29 06:57:34 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-03-29 06:57:34 +0300
commitdfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (patch)
tree92d77142391ed6eab45a4bec792ed02be91fbe39 /test/web/streamer
parentedb659dc579fe56227adef0b0704ff13b6ef717e (diff)
parent4e81b4b190161ebb0c496c682fa8e1e0c38a3903 (diff)
downloadpleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.tar.gz
pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.zip
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/web/streamer')
-rw-r--r--test/web/streamer/streamer_test.exs3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/web/streamer/streamer_test.exs b/test/web/streamer/streamer_test.exs
index 339f99bbf..a5d6e8ecf 100644
--- a/test/web/streamer/streamer_test.exs
+++ b/test/web/streamer/streamer_test.exs
@@ -19,8 +19,7 @@ defmodule Pleroma.Web.StreamerTest do
@streamer_timeout 150
@streamer_start_wait 10
-
- clear_config([:instance, :skip_thread_containment])
+ setup do: clear_config([:instance, :skip_thread_containment])
describe "user streams" do
setup do