diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-08-14 19:22:15 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-08-14 19:22:15 +0000 |
| commit | 31d576de0c91019d80e465984d4423779e7ccede (patch) | |
| tree | 4395e12be4f57f64ad2215595fcaed9f1819fd82 /test | |
| parent | dc902ad3df5acd6e64a871175552c3a37724e2ee (diff) | |
| parent | c43152f6c17a287a9fe4f2556ca20a140ea30248 (diff) | |
| download | pleroma-31d576de0c91019d80e465984d4423779e7ccede.tar.gz pleroma-31d576de0c91019d80e465984d4423779e7ccede.zip | |
Merge branch 'misc-otp-issues' into 'develop'
Misc OTP issues
See merge request pleroma/pleroma!1567
Diffstat (limited to 'test')
| -rw-r--r-- | test/config/transfer_task_test.exs | 4 | ||||
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/config/transfer_task_test.exs b/test/config/transfer_task_test.exs index dbeadbe87..4455a4d47 100644 --- a/test/config/transfer_task_test.exs +++ b/test/config/transfer_task_test.exs @@ -31,7 +31,7 @@ defmodule Pleroma.Config.TransferTaskTest do value: [live: 15, com: 35] }) - Pleroma.Config.TransferTask.start_link() + Pleroma.Config.TransferTask.start_link([]) assert Application.get_env(:pleroma, :test_key) == [live: 2, com: 3] assert Application.get_env(:idna, :test_key) == [live: 15, com: 35] @@ -50,7 +50,7 @@ defmodule Pleroma.Config.TransferTaskTest do }) assert ExUnit.CaptureLog.capture_log(fn -> - Pleroma.Config.TransferTask.start_link() + Pleroma.Config.TransferTask.start_link([]) end) =~ "updating env causes error, key: \"undefined_atom_key\", error: %ArgumentError{message: \"argument error\"}" end diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 2febe8b3a..112e272f9 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -2624,7 +2624,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do |> Changeset.put_embed(:info, info_change) |> User.update_and_set_cache() - Pleroma.Stats.update_stats() + Pleroma.Stats.force_update() conn = get(conn, "/api/v1/instance") @@ -2642,7 +2642,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do insert(:user, %{local: false, nickname: "u@peer1.com"}) insert(:user, %{local: false, nickname: "u@peer2.com"}) - Pleroma.Stats.update_stats() + Pleroma.Stats.force_update() conn = get(conn, "/api/v1/instance/peers") |