fix backport

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 6aa01606b..3c137836c 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -56,9 +56,9 @@ defmodule Pleroma.Object.Fetcher do
         {:normalize, object = %Object{}} ->
           {:ok, object}
 
-        e ->
+        _e ->
           # Only fallback when receiving a fetch/normalization error with ActivityPub
-          Logger.warn("Couldn't get object via AP, trying out OStatus fetching... #{inspect(e)}")
+          Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
 
           # FIXME: OStatus Object Containment?
           case OStatus.fetch_activity_from_url(id) do
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index f213ca64a..0158314b0 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -841,7 +841,7 @@ defmodule HttpRequestMock do
     {:ok,
      %Tesla.Env{
        status: 200,
-       body: File.read!("test/fixtures/tesla_mock/https__info.pleroma.site_activity.json")
+       body: File.read!("test/fixtures/httpoison_mock/https__info.pleroma.site_activity.json")
      }}
   end
 
@@ -853,7 +853,7 @@ defmodule HttpRequestMock do
     {:ok,
      %Tesla.Env{
        status: 200,
-       body: File.read!("test/fixtures/tesla_mock/https__info.pleroma.site_activity2.json")
+       body: File.read!("test/fixtures/httpoison_mock/https__info.pleroma.site_activity2.json")
      }}
   end
 
@@ -865,7 +865,7 @@ defmodule HttpRequestMock do
     {:ok,
      %Tesla.Env{
        status: 200,
-       body: File.read!("test/fixtures/tesla_mock/https__info.pleroma.site_activity3.json")
+       body: File.read!("test/fixtures/httpoison_mock/https__info.pleroma.site_activity3.json")
      }}
   end