diff options
author | lain <lain@soykaf.club> | 2019-08-19 17:00:59 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-08-19 17:00:59 +0000 |
commit | d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff (patch) | |
tree | cd76bb5d4cf7716624378a9cbf9cd42a63eee735 /test/web/instances/instance_test.exs | |
parent | cb222b72b39ae4dc887657d1eae03d0360cbd429 (diff) | |
parent | e5d2c0c66949ad90f9ee02874bdea2aa94f7f683 (diff) | |
download | pleroma-d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff.tar.gz pleroma-d2c9befc64d4b8d4f56b5e23afeb1b720767e7ff.zip |
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/web/instances/instance_test.exs')
-rw-r--r-- | test/web/instances/instance_test.exs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/test/web/instances/instance_test.exs b/test/web/instances/instance_test.exs index d28730994..3fd011fd3 100644 --- a/test/web/instances/instance_test.exs +++ b/test/web/instances/instance_test.exs @@ -10,14 +10,8 @@ defmodule Pleroma.Instances.InstanceTest do import Pleroma.Factory - setup_all do - config_path = [:instance, :federation_reachability_timeout_days] - initial_setting = Pleroma.Config.get(config_path) - - Pleroma.Config.put(config_path, 1) - on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end) - - :ok + clear_config_all([:instance, :federation_reachability_timeout_days]) do + Pleroma.Config.put([:instance, :federation_reachability_timeout_days], 1) end describe "set_reachable/1" do |