diff options
| author | Maksim <parallel588@gmail.com> | 2019-07-18 12:30:18 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-18 12:30:18 +0000 |
| commit | b6b748d3e7f3383303a2fcccb17b7b0f7054100f (patch) | |
| tree | d053d9e529254abc5f1a3b290b9444f3cf31ea6d /lib/pleroma/uploaders | |
| parent | e2c39e1cc077c77f3bd8325b99e9a21d42b8133e (diff) | |
| download | pleroma-b6b748d3e7f3383303a2fcccb17b7b0f7054100f.tar.gz | |
tests for Uploader with webhook
Diffstat (limited to 'lib/pleroma/uploaders')
| -rw-r--r-- | lib/pleroma/uploaders/uploader.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/uploaders/uploader.ex b/lib/pleroma/uploaders/uploader.ex index 0af76bc59..c0b22c28a 100644 --- a/lib/pleroma/uploaders/uploader.ex +++ b/lib/pleroma/uploaders/uploader.ex @@ -68,7 +68,14 @@ defmodule Pleroma.Uploaders.Uploader do {:error, error} end after - 30_000 -> {:error, dgettext("errors", "Uploader callback timeout")} + callback_timeout() -> {:error, dgettext("errors", "Uploader callback timeout")} + end + end + + defp callback_timeout do + case Mix.env() do + :test -> 1_000 + _ -> 30_000 end end end |