summaryrefslogtreecommitdiff
path: root/test/support/cluster.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-10 12:26:53 +0200
committerlain <lain@soykaf.club>2020-07-10 12:26:53 +0200
commitb39eb6ecc573c310801fe49f35d92246ddcb6226 (patch)
tree32b20b5a0ec3f5c8d44f1157087868adfaa549b0 /test/support/cluster.ex
parent208baf157ad0c8be470566d5d51d0214c229e6a5 (diff)
parent8aa7143f464562ca2a0572087c526f26d1a3b7ef (diff)
downloadpleroma-b39eb6ecc573c310801fe49f35d92246ddcb6226.tar.gz
pleroma-b39eb6ecc573c310801fe49f35d92246ddcb6226.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
Diffstat (limited to 'test/support/cluster.ex')
-rw-r--r--test/support/cluster.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/support/cluster.ex b/test/support/cluster.ex
index deb37f361..524194cf4 100644
--- a/test/support/cluster.ex
+++ b/test/support/cluster.ex
@@ -97,7 +97,7 @@ defmodule Pleroma.Cluster do
silence_logger_warnings(fn ->
node_configs
|> Enum.map(&Task.async(fn -> start_slave(&1) end))
- |> Enum.map(&Task.await(&1, 60_000))
+ |> Enum.map(&Task.await(&1, 90_000))
end)
end