Merge branch 'test-timeout' into 'develop'

Fix intermittent failures in federated testing See merge request pleroma/pleroma!2058
2019-12-12 09:31:50 +00:00 · 2019-12-12 09:31:50 +00:00 · 68a667a465
parent 8cb852523a 63ffa0e3ed
commit 68a667a465
1 changed files with 3 additions and 1 deletions
--- a/config/test.exs
+++ b/config/test.exs
@ -68,7 +68,9 @@
  queues: false,
  prune: :disabled

-config :pleroma, Pleroma.Scheduler, jobs: []
+config :pleroma, Pleroma.Scheduler,
+  jobs: [],
+  global: false

 config :pleroma, Pleroma.ScheduledActivity,
  daily_user_limit: 2,