projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into global-status-expiration
[akkoma]
/
test
/
web
/
streamer
/
streamer_test.exs
diff --git
a/test/web/streamer/streamer_test.exs
b/test/web/streamer/streamer_test.exs
index 2a7550551443216d9fd86d35ad89bd58c0eb7cda..a5d6e8ecfdad77da1c384c0f9997e45ca68fa595 100644
(file)
--- a/
test/web/streamer/streamer_test.exs
+++ b/
test/web/streamer/streamer_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.StreamerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.StreamerTest do
@@
-19,8
+19,7
@@
defmodule Pleroma.Web.StreamerTest do
@streamer_timeout 150
@streamer_start_wait 10
@streamer_timeout 150
@streamer_start_wait 10
-
- clear_config_all([:instance, :skip_thread_containment])
+ setup do: clear_config([:instance, :skip_thread_containment])
describe "user streams" do
setup do
describe "user streams" do
setup do