diff options
| author | lain <lain@soykaf.club> | 2020-12-18 19:49:01 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-12-18 19:53:19 +0100 |
| commit | 95a9bdfc374a013be47e74b25bdba5d91f51948b (patch) | |
| tree | 8c978c04055f71704ddf6f862effdf9462654a88 /lib | |
| parent | 713612c37725c81b0906b03528c9eaa474816c7d (diff) | |
| download | pleroma-95a9bdfc374a013be47e74b25bdba5d91f51948b.tar.gz | |
Tests: Use NullCache for async tests.
Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/emoji/pack.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/emoji/pack.ex b/lib/pleroma/emoji/pack.ex index 5a1a1a6c6..ec97aa652 100644 --- a/lib/pleroma/emoji/pack.ex +++ b/lib/pleroma/emoji/pack.ex @@ -417,7 +417,7 @@ defmodule Pleroma.Emoji.Pack do ttl_per_file = Pleroma.Config.get!([:emoji, :shared_pack_cache_seconds_per_file]) overall_ttl = :timer.seconds(ttl_per_file * Enum.count(files)) - @cachex.put!( + @cachex.put( :emoji_packs_cache, pack.name, # if pack.json MD5 changes, the cache is not valid anymore diff --git a/lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex b/lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex index ecd369037..2f712fb8c 100644 --- a/lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex @@ -40,7 +40,7 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheController do defp fetch_entries(params) do MediaProxy.cache_table() - |> @cachex.stream!(@cachex.Query.create(true, :key)) + |> @cachex.stream!(Cachex.Query.create(true, :key)) |> filter_entries(params[:query]) end |