diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-07-16 14:51:36 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-07-16 14:51:36 -0500 |
commit | 38425ebdbf157377ccb0402f78dc3d02f81c55f5 (patch) | |
tree | 740f32837d28e918f097c948d89827d99434d5b2 /test/support/cluster.ex | |
parent | 8daacc911498d827fd68ea3d34eb1be9ae4a1ffe (diff) | |
parent | 3a2b2cb6f2d6ce39ae0d246649189c021c535992 (diff) | |
download | pleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.tar.gz pleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.zip |
Merge remote-tracking branch 'upstream/develop' into linkify
Diffstat (limited to 'test/support/cluster.ex')
-rw-r--r-- | test/support/cluster.ex | 2 |
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 |