commit: 613f55b078e5daf6df6a5ead4865a051c85940f7
parent ab60c0c6c2145df145a71f6786bd087ea8304596
Author: lain <lain@soykaf.club>
Date: Mon, 6 Dec 2021 21:16:30 +0000
Merge branch 'benchmark' into 'develop'
Fix benchmarks
See merge request pleroma/pleroma!3551
Diffstat:
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/benchmarks/load_testing/activities.ex b/benchmarks/load_testing/activities.ex
@@ -394,7 +394,7 @@ defmodule Pleroma.LoadTesting.Activities do
defp other_data(actor, content) do
%{host: host} = URI.parse(actor.ap_id)
- datetime = DateTime.utc_now()
+ datetime = DateTime.utc_now() |> to_string()
context_id = "https://#{host}/contexts/#{UUID.generate()}"
activity_id = "https://#{host}/activities/#{UUID.generate()}"
object_id = "https://#{host}/objects/#{UUID.generate()}"
diff --git a/config/benchmark.exs b/config/benchmark.exs
@@ -4,8 +4,7 @@ import Config
# you can enable the server option below.
config :pleroma, Pleroma.Web.Endpoint,
http: [port: 4001],
- url: [port: 4001],
- server: true
+ url: [port: 4001]
# Disable captha for tests
config :pleroma, Pleroma.Captcha,
@@ -44,7 +43,7 @@ config :pleroma, Pleroma.Repo,
pool_size: 10
# Reduce hash rounds for testing
-config :pbkdf2_elixir, rounds: 1
+config :pleroma, :password, iterations: 1
config :tesla, adapter: Tesla.Mock
diff --git a/mix.exs b/mix.exs
@@ -86,7 +86,7 @@ defmodule Pleroma.Mixfile do
end
# Specifies which paths to compile per environment.
- defp elixirc_paths(:benchmark), do: ["lib", "benchmarks"]
+ defp elixirc_paths(:benchmark), do: ["lib", "benchmarks", "priv/scrubbers"]
defp elixirc_paths(:test), do: ["lib", "test/support"]
defp elixirc_paths(_), do: ["lib"]