diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-01-06 15:22:35 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-01-06 15:22:35 -0600 |
| commit | 1438fd958325c3d469315c478f06def9e4dd0de3 (patch) | |
| tree | 738e7e9ce8e0e0af89d9dff411191643cbf45aab /benchmarks | |
| parent | 2aeb229de3f59e1704c633c31415e7e834f6ba67 (diff) | |
| parent | 5e128a6be30563adc3b8a938aa68d18ac04cdfa0 (diff) | |
| download | pleroma-1438fd958325c3d469315c478f06def9e4dd0de3.tar.gz pleroma-1438fd958325c3d469315c478f06def9e4dd0de3.zip | |
Merge remote-tracking branch 'upstream/develop' into block-behavior
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/load_testing/users.ex | 4 | ||||
| -rw-r--r-- | benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/benchmarks/load_testing/users.ex b/benchmarks/load_testing/users.ex index 6cf3958c1..34a904ac2 100644 --- a/benchmarks/load_testing/users.ex +++ b/benchmarks/load_testing/users.ex @@ -109,8 +109,8 @@ defmodule Pleroma.LoadTesting.Users do end def make_friends(%User{} = main_user, %User{} = user) do - {:ok, _} = User.follow(main_user, user) - {:ok, _} = User.follow(user, main_user) + {:ok, _, _} = User.follow(main_user, user) + {:ok, _, _} = User.follow(user, main_user) end @spec get_users(User.t(), keyword()) :: [User.t()] diff --git a/benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex b/benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex index 9b7ac6111..aed32f194 100644 --- a/benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex +++ b/benchmarks/mix/tasks/pleroma/benchmarks/timelines.ex @@ -50,7 +50,7 @@ defmodule Mix.Tasks.Pleroma.Benchmarks.Timelines do ) users - |> Enum.each(fn {:ok, follower} -> Pleroma.User.follow(follower, user) end) + |> Enum.each(fn {:ok, follower, user} -> Pleroma.User.follow(follower, user) end) Benchee.run( %{ |