pleroma

commit: 60deddb7e5b8bb10037cca6e6f11a5bbef298d39
parent 71c80204c9b395545419a818db826b3f5cb9e6a5
Author: Alex Gleason <alex@alexgleason.me>
Date:   Wed,  2 Feb 2022 19:57:03 +0000

Merge branch 'fix-tests-warn' into 'develop'

Fix tests matching on "warn"

See merge request pleroma/pleroma!3629
Diffstat:
M
test/pleroma/reverse_proxy_test.exs
2
+-
M
test/pleroma/web/common_api/utils_test.exs
8
++++----
M
test/pleroma/web/mastodon_api/controllers/filter_controller_test.exs
1
+

3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/test/pleroma/reverse_proxy_test.exs b/test/pleroma/reverse_proxy_test.exs
@@ -130,7 +130,7 @@ defmodule Pleroma.ReverseProxyTest do
       assert capture_log(fn ->
                ReverseProxy.call(conn, "/stream-bytes/50", max_body_length: 30)
              end) =~
-               "[warn] Elixir.Pleroma.ReverseProxy request to /stream-bytes/50 failed while reading/chunking: :body_too_large"
+               "Elixir.Pleroma.ReverseProxy request to /stream-bytes/50 failed while reading/chunking: :body_too_large"
     end
   end
 
diff --git a/test/pleroma/web/common_api/utils_test.exs b/test/pleroma/web/common_api/utils_test.exs
@@ -309,7 +309,7 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
 
       assert capture_log(fn ->
                assert Utils.date_to_asctime(date) == expected
-             end) =~ "[warn] Date #{date} in wrong format, must be ISO 8601"
+             end) =~ "Date #{date} in wrong format, must be ISO 8601"
     end
 
     test "when date is a Unix timestamp" do
@@ -319,7 +319,7 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
 
       assert capture_log(fn ->
                assert Utils.date_to_asctime(date) == expected
-             end) =~ "[warn] Date #{date} in wrong format, must be ISO 8601"
+             end) =~ "Date #{date} in wrong format, must be ISO 8601"
     end
 
     test "when date is nil" do
@@ -327,13 +327,13 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
 
       assert capture_log(fn ->
                assert Utils.date_to_asctime(nil) == expected
-             end) =~ "[warn] Date  in wrong format, must be ISO 8601"
+             end) =~ "Date  in wrong format, must be ISO 8601"
     end
 
     test "when date is a random string" do
       assert capture_log(fn ->
                assert Utils.date_to_asctime("foo") == ""
-             end) =~ "[warn] Date foo in wrong format, must be ISO 8601"
+             end) =~ "Date foo in wrong format, must be ISO 8601"
     end
   end
 
diff --git a/test/pleroma/web/mastodon_api/controllers/filter_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/filter_controller_test.exs
@@ -177,6 +177,7 @@ defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
       assert response["whole_word"] == true
     end
 
+    @tag :erratic
     test "with adding expires_at", %{conn: conn, user: user} do
       filter = insert(:filter, user: user)
       in_seconds = 600