diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-12-19 12:16:33 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-12-19 12:16:33 -0600 |
| commit | 50638525db6bf7d59c4a5820848c9f6773cc49e1 (patch) | |
| tree | 6d94f34ddd482d57178107076a7e2f44698a3e43 /test/plugs | |
| parent | df469b4468168cf072e73df73e0fdde2bbab1da5 (diff) | |
| parent | 38ad407395e838ddf1c11922806adc080af44d36 (diff) | |
| download | pleroma-50638525db6bf7d59c4a5820848c9f6773cc49e1.tar.gz pleroma-50638525db6bf7d59c4a5820848c9f6773cc49e1.zip | |
Merge branch 'develop' into config/benchmark
Diffstat (limited to 'test/plugs')
| -rw-r--r-- | test/plugs/rate_limiter_test.exs | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/test/plugs/rate_limiter_test.exs b/test/plugs/rate_limiter_test.exs index 49f63c424..78f1ea9e4 100644 --- a/test/plugs/rate_limiter_test.exs +++ b/test/plugs/rate_limiter_test.exs @@ -145,9 +145,9 @@ defmodule Pleroma.Plugs.RateLimiterTest do test "can have limits seperate from unauthenticated connections" do limiter_name = :test_authenticated - scale = 1000 + scale = 50 limit = 5 - Pleroma.Config.put([:rate_limit, limiter_name], [{1, 10}, {scale, limit}]) + Pleroma.Config.put([:rate_limit, limiter_name], [{1000, 1}, {scale, limit}]) opts = RateLimiter.init(name: limiter_name) @@ -164,16 +164,6 @@ defmodule Pleroma.Plugs.RateLimiterTest do assert %{"error" => "Throttled"} = Phoenix.ConnTest.json_response(conn, :too_many_requests) assert conn.halted - - Process.sleep(1550) - - conn = conn(:get, "/") |> assign(:user, user) - conn = RateLimiter.call(conn, opts) - assert {1, 4} = RateLimiter.inspect_bucket(conn, limiter_name, opts) - - refute conn.status == Plug.Conn.Status.code(:too_many_requests) - refute conn.resp_body - refute conn.halted end test "diffrerent users are counted independently" do |
