pleroma

commit: 6783d544b2d3856bda3f8f9136011923ee8b30fe
parent: ec470c4c7717dc9479df9e7b70f9805dcf2f5e08
Author: lain <lain@soykaf.club>
Date:   Mon, 25 May 2020 12:00:53 +0000

Merge branch 'flaky-tests' into 'develop'

Flaky tests

See merge request pleroma/pleroma!2578
Diffstat:
M
test/web/activity_pub/mrf/steal_emoji_policy_test.exs
12
++++++++----

1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/test/web/activity_pub/mrf/steal_emoji_policy_test.exs b/test/web/activity_pub/mrf/steal_emoji_policy_test.exs
@@ -14,13 +14,17 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicyTest do
   end
 
   setup do
-    clear_config(:mrf_steal_emoji)
-
     emoji_path = Path.join(Config.get([:instance, :static_dir]), "emoji/stolen")
     File.rm_rf!(emoji_path)
     File.mkdir!(emoji_path)
 
     Pleroma.Emoji.reload()
+
+    on_exit(fn ->
+      File.rm_rf!(emoji_path)
+    end)
+
+    :ok
   end
 
   test "does nothing by default" do
@@ -53,8 +57,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicyTest do
       }
     }
 
-    Config.put([:mrf_steal_emoji, :hosts], ["example.org"])
-    Config.put([:mrf_steal_emoji, :size_limit], 284_468)
+    clear_config([:mrf_steal_emoji, :hosts], ["example.org"])
+    clear_config([:mrf_steal_emoji, :size_limit], 284_468)
 
     assert {:ok, message} == StealEmojiPolicy.filter(message)