summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-10 08:56:12 +0000
committerlain <lain@soykaf.club>2020-07-10 08:56:12 +0000
commit4d809144d84c743efbabeb2ca85f34f360a61b1e (patch)
tree7dbcdf4638e95e3f320c97ba71df47c6f0f14d7c /test
parent5ea638757210c34b40fb568e537082b78f4118a6 (diff)
parent08211eff22d4aab8ee73dbe16212d2aed1f6789b (diff)
downloadpleroma-4d809144d84c743efbabeb2ca85f34f360a61b1e.tar.gz
pleroma-4d809144d84c743efbabeb2ca85f34f360a61b1e.zip
Merge branch 'cluster-test-ci' into 'develop'
RE-enable cluster tests on CI See merge request pleroma/pleroma!2743
Diffstat (limited to 'test')
-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