diff options
| author | lain <lain@soykaf.club> | 2019-12-16 17:07:13 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-12-16 17:07:13 +0000 |
| commit | 804b961d3c8e0034c7b6057a164126e5d01a084b (patch) | |
| tree | f33623cf86e39c4ae818b6ad597631a92281ab05 /test/plugs | |
| parent | e659fbfbf9ec586ea0086a78a7443e77abebf1ab (diff) | |
| parent | eae65e3216cb43f97e58ace7e0a57919332de8b8 (diff) | |
| download | pleroma-804b961d3c8e0034c7b6057a164126e5d01a084b.tar.gz pleroma-804b961d3c8e0034c7b6057a164126e5d01a084b.zip | |
Merge branch 'fix/remove-useless-sleep' into 'develop'
Remove useless sleeping/reduce it
See merge request pleroma/pleroma!2069
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 |
