diff options
| author | lain <lain@soykaf.club> | 2019-12-12 09:31:50 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-12-12 09:31:50 +0000 |
| commit | 68a667a465f0c51ba9842742ef010da7b69d7a69 (patch) | |
| tree | a55a58db73256d74757c716334de8b8d60fd8941 | |
| parent | 8cb852523a13530ae77b76e4d3253ccd5883e9dc (diff) | |
| parent | 63ffa0e3ed6640ba0c1e1e235b4cafa9ac386fb3 (diff) | |
| download | pleroma-68a667a465f0c51ba9842742ef010da7b69d7a69.tar.gz | |
Merge branch 'test-timeout' into 'develop'
Fix intermittent failures in federated testing
See merge request pleroma/pleroma!2058
| -rw-r--r-- | config/test.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 9b737d4d7..d52ced612 100644 --- a/config/test.exs +++ b/config/test.exs @@ -68,7 +68,9 @@ config :pleroma, Oban, queues: false, prune: :disabled -config :pleroma, Pleroma.Scheduler, jobs: [] +config :pleroma, Pleroma.Scheduler, + jobs: [], + global: false config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, |