aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/federation/federation_test.exs8
-rw-r--r--test/test_helper.exs3
2 files changed, 7 insertions, 4 deletions
diff --git a/test/federation/federation_test.exs b/test/federation/federation_test.exs
index 7400d2abc..8b8e8c870 100644
--- a/test/federation/federation_test.exs
+++ b/test/federation/federation_test.exs
@@ -4,11 +4,15 @@
defmodule Pleroma.Integration.FederationTest do
use Pleroma.DataCase
-
+ @moduletag :federated
import Pleroma.Cluster
- @federated1 :"federated1@127.0.0.1"
+ setup_all do
+ Pleroma.Cluster.spawn_default_cluster()
+ :ok
+ end
+ @federated1 :"federated1@127.0.0.1"
describe "federated cluster primitives" do
test "within/2 captures local bindings and executes block on remote node" do
captured_binding = :captured
diff --git a/test/test_helper.exs b/test/test_helper.exs
index c8dbee010..b80c2683e 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -2,8 +2,7 @@
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-os_exclude = if :os.type() == {:unix, :darwin}, do: [skip_on_mac: true], else: []
-ExUnit.start(exclude: os_exclude)
+ExUnit.start(exclude: [:federated])
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, :manual)
Mox.defmock(Pleroma.ReverseProxy.ClientMock, for: Pleroma.ReverseProxy.Client)
{:ok, _} = Application.ensure_all_started(:ex_machina)