Tests: Don't run federated tests by default

diff --git a/test/federation/federation_test.exs b/test/federation/federation_test.exs
index 7400d2abc2e46641b704970afe83bbd12b33eded..8b8e8c8701b37256f7589f25da61397503dca4a2 100644 (file)
--- 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 c8dbee0108511d51f5fb9e401d76dc850c6e67f4..b80c2683ec04c8a87db7e2dbd70f680850a76182 100644 (file)
--- 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)