summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2023-12-20 23:26:59 +0000
committerfeld <feld@feld.me>2023-12-20 23:26:59 +0000
commit344c798b4cb2a7cb65337a81d8b5a2eb27dd1be3 (patch)
treec0fdde75c8a64b239bd86bf8ac00f48182deaa9b /test
parent56618873af1aa08f6c271b6cd0f0cbcdfd56bcf1 (diff)
parent928bda2e439285ef3e662290c0cc6b782909fb82 (diff)
downloadpleroma-344c798b4cb2a7cb65337a81d8b5a2eb27dd1be3.tar.gz
pleroma-344c798b4cb2a7cb65337a81d8b5a2eb27dd1be3.zip
Merge branch 'fix-otp-comparison' into 'develop'
Fix invalid string comparison for OTP versions and replace with config See merge request pleroma/pleroma!4013
Diffstat (limited to 'test')
-rw-r--r--test/support/cluster.ex14
1 files changed, 5 insertions, 9 deletions
diff --git a/test/support/cluster.ex b/test/support/cluster.ex
index 25170163f..a0ec91168 100644
--- a/test/support/cluster.ex
+++ b/test/support/cluster.ex
@@ -223,17 +223,13 @@ defmodule Pleroma.Cluster do
|> String.to_atom()
end
- if System.otp_release() >= "25" do
- @peer :peer
- else
- @peer :slave
- end
-
defp do_start_slave(%{host: host, name: name, args: args} = opts) do
- if System.otp_release() >= "25" do
- @peer.start(opts)
+ peer_module = Application.get_env(__MODULE__, :peer_module)
+
+ if peer_module == :peer do
+ peer_module.start(opts)
else
- @peer.start(host, name, args)
+ peer_module.start(host, name, args)
end
end
end