Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-secure-mode

1 files changed, 14 insertions, 1 deletions

diff --git a/test/support/cluster.ex b/test/support/cluster.ex
index 1c923fb0c..a0ec91168 100644
--- a/test/support/cluster.ex
+++ b/test/support/cluster.ex
@@ -127,7 +127,10 @@ defmodule Pleroma.Cluster do
 
   defp start_slave({node_host, override_configs}) do
     log(node_host, "booting federated VM")
-    {:ok, node} = :slave.start(~c"127.0.0.1", node_name(node_host), vm_args())
+
+    {:ok, node} =
+      do_start_slave(%{host: "127.0.0.1", name: node_name(node_host), args: vm_args()})
+
     add_code_paths(node)
     load_apps_and_transfer_configuration(node, override_configs)
     ensure_apps_started(node)
@@ -219,4 +222,14 @@ defmodule Pleroma.Cluster do
     |> Enum.at(0)
     |> String.to_atom()
   end
+
+  defp do_start_slave(%{host: host, name: name, args: args} = opts) do
+    peer_module = Application.get_env(__MODULE__, :peer_module)
+
+    if peer_module == :peer do
+      peer_module.start(opts)
+    else
+      peer_module.start(host, name, args)
+    end
+  end
 end