From af9eb7a2b10d2994f915f8a33c2f5f7a7db1128e Mon Sep 17 00:00:00 2001
From: stwf <steven.fuchs@dockyard.com>
Date: Wed, 8 Jul 2020 11:32:04 -0400
Subject: [PATCH 1/2] re-enable federation tests

---
 .gitlab-ci.yml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4bd59b43..6a2be879e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,21 +63,19 @@ unit-testing:
     - mix ecto.migrate
     - mix coveralls --preload-modules
 
-# Removed to fix CI issue. In this early state it wasn't adding much value anyway.
-# TODO Fix and reinstate federated testing
-# federated-testing:
-#   stage: test
-#   cache: *testing_cache_policy
-#   services:
-#   - name: minibikini/postgres-with-rum:12
-#     alias: postgres
-#     command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-#   script:
-#     - mix deps.get
-#     - mix ecto.create
-#     - mix ecto.migrate
-#     - epmd -daemon
-#     - mix test --trace --only federated
+federated-testing:
+  stage: test
+  cache: *testing_cache_policy
+  services:
+  - name: minibikini/postgres-with-rum:12
+    alias: postgres
+    command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+  script:
+    - mix deps.get
+    - mix ecto.create
+    - mix ecto.migrate
+    - epmd -daemon
+    - mix test --trace --only federated
 
 unit-testing-rum:
   stage: test

From 08211eff22d4aab8ee73dbe16212d2aed1f6789b Mon Sep 17 00:00:00 2001
From: stwf <steven.fuchs@dockyard.com>
Date: Wed, 8 Jul 2020 15:56:03 -0400
Subject: [PATCH 2/2] Re-enable the federated tests, increase timeout

---
 test/support/cluster.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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