diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-29 10:17:59 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-29 10:17:59 +0300 |
| commit | 52cc7de82cf3aa637d599edc357909be8c9366eb (patch) | |
| tree | 3331c84530c0d93c41171f83c6270c8d499f5195 /test/web/streamer | |
| parent | c8d3c3bfeca66d16846f97b50328e0718cfe5fef (diff) | |
| parent | d7b40dd4ba5bf3890be8a8b69d5aff84f5ffc5d2 (diff) | |
| download | pleroma-52cc7de82cf3aa637d599edc357909be8c9366eb.tar.gz pleroma-52cc7de82cf3aa637d599edc357909be8c9366eb.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# mix.lock
Diffstat (limited to 'test/web/streamer')
| -rw-r--r-- | test/web/streamer/streamer_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/streamer/streamer_test.exs b/test/web/streamer/streamer_test.exs index 802c22e5d..8911c46b1 100644 --- a/test/web/streamer/streamer_test.exs +++ b/test/web/streamer/streamer_test.exs @@ -15,7 +15,7 @@ defmodule Pleroma.Web.StreamerTest do alias Pleroma.Web.Streamer.StreamerSocket alias Pleroma.Web.Streamer.Worker - @moduletag needs_streamer: true + @moduletag needs_streamer: true, capture_log: true clear_config_all([:instance, :skip_thread_containment]) describe "user streams" do |