diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-12-19 17:24:08 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-12-19 17:24:08 +0300 |
commit | ead2d18826cf446fd7da542c55b6601e9bfc001c (patch) | |
tree | 8fb08b5673235ae9844ca858a34b742d1b548a70 /test/plugs | |
parent | 455e072d27f28c39050b2dc24b346a8f2ef30f90 (diff) | |
parent | d23a80e6911a85e2377ad2336a050e0206c74db9 (diff) | |
download | pleroma-ead2d18826cf446fd7da542c55b6601e9bfc001c.tar.gz pleroma-ead2d18826cf446fd7da542c55b6601e9bfc001c.zip |
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
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 |