diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-20 20:43:18 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-20 20:43:18 +0300 |
commit | c6fdfbc4f14b855d9cdf2d757ff2c43282aabe90 (patch) | |
tree | ba8cab33d76b3961ad1080f307bc2aedf1e9cc10 /benchmarks/load_testing/helper.ex | |
parent | b4cbf0568bd6924ded9b9fbdb588a4da92bf83e7 (diff) | |
parent | 62e3d76a450c1b34ba8d0c88a184ec861ed90f29 (diff) | |
download | pleroma-c6fdfbc4f14b855d9cdf2d757ff2c43282aabe90.tar.gz |
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
Diffstat (limited to 'benchmarks/load_testing/helper.ex')
-rw-r--r-- | benchmarks/load_testing/helper.ex | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/benchmarks/load_testing/helper.ex b/benchmarks/load_testing/helper.ex new file mode 100644 index 000000000..47b25c65f --- /dev/null +++ b/benchmarks/load_testing/helper.ex @@ -0,0 +1,11 @@ +defmodule Pleroma.LoadTesting.Helper do + defmacro __using__(_) do + quote do + import Ecto.Query + alias Pleroma.Repo + alias Pleroma.User + + defp to_sec(microseconds), do: microseconds / 1_000_000 + end + end +end |