Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/urlscan/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def _send_request(
utcnow = datetime.datetime.now(datetime.timezone.utc)
if rate_limit.remaining == 0 and rate_limit.reset > utcnow:
raise RateLimitRemainingError(
f"{action} is rate limited. Wait until {utcnow}."
f"{action} is rate limited. Wait until {rate_limit.reset}."
)

res = ClientResponse(session.send(request))
Expand Down
26 changes: 26 additions & 0 deletions tests/unit/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,32 @@ def handler(_: Request):
client.get_result("dummy")


@pytest.mark.freeze_time("2020-01-01")
def test_rate_limit_remaining_error_message(client: Client, httpserver: HTTPServer):
httpserver.expect_request(
"/api/v1/result/dummy/",
method="GET",
).respond_with_response(
Response(
"{}",
status=200,
headers={
"X-Rate-Limit-Action": "retrieve",
"X-Rate-Limit-Remaining": "0",
"X-Rate-Limit-Reset": "2020-01-02T00:00:00.000Z",
},
)
)

assert client.get_result("dummy") is not None
# the message should contain the reset time, not the current time
with pytest.raises(
RateLimitRemainingError,
match=r"Wait until 2020-01-02 00:00:00\+00:00",
):
client.get_result("dummy")


def test_scan(client: Client, httpserver: HTTPServer):
httpserver.expect_request(
"/api/v1/scan/",
Expand Down
Loading