Skip to content

Commit 6028542

Browse files
authored
fix(ci): fix rate limit test (#58184)
I don't know how this test passed but the rate limit was bumped up in #57876 while the test was not modified. * Move the test outside of the snuba acceptance suite since it does not actually test snuba * fix the test to use the rate limit constant so it doesn't fail like this anymore
1 parent 06597ee commit 6028542

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

tests/sentry/api/test_organization_events.py

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
from unittest import mock
22

3+
from django.test import override_settings
34
from django.urls import reverse
45

6+
from sentry.api.endpoints.organization_events import RATE_LIMIT
57
from sentry.search.events import constants
68
from sentry.testutils.cases import APITestCase
7-
from sentry.testutils.helpers.datetime import before_now, iso_format
9+
from sentry.testutils.helpers.datetime import before_now, freeze_time, iso_format
810
from sentry.testutils.silo import region_silo_test
911
from sentry.utils.snuba import QueryExecutionError, QueryIllegalTypeOfArgument, RateLimitExceeded
1012

@@ -156,3 +158,17 @@ def test_valid_referrer(self, mock):
156158
self.do_request(query)
157159
_, kwargs = mock.call_args
158160
self.assertEqual(kwargs["referrer"], "api.performance.transaction-summary")
161+
162+
@override_settings(SENTRY_SELF_HOSTED=False)
163+
def test_ratelimit(self):
164+
query = {
165+
"field": ["transaction"],
166+
"project": [self.project.id],
167+
}
168+
with freeze_time("2000-01-01"):
169+
for _ in range(RATE_LIMIT):
170+
self.do_request(query, features={"organizations:discover-events-rate-limit": True})
171+
response = self.do_request(
172+
query, features={"organizations:discover-events-rate-limit": True}
173+
)
174+
assert response.status_code == 429, response.content

tests/snuba/api/endpoints/test_organization_events.py

-14
Original file line numberDiff line numberDiff line change
@@ -5270,20 +5270,6 @@ def test_chained_or_query_meta_tip(self):
52705270
"columns": None,
52715271
}
52725272

5273-
@override_settings(SENTRY_SELF_HOSTED=False)
5274-
def test_ratelimit(self):
5275-
query = {
5276-
"field": ["transaction"],
5277-
"project": [self.project.id],
5278-
}
5279-
with freeze_time("2000-01-01"):
5280-
for _ in range(15):
5281-
self.do_request(query, features={"organizations:discover-events-rate-limit": True})
5282-
response = self.do_request(
5283-
query, features={"organizations:discover-events-rate-limit": True}
5284-
)
5285-
assert response.status_code == 429, response.content
5286-
52875273
@override_settings(SENTRY_SELF_HOSTED=False)
52885274
def test_no_ratelimit(self):
52895275
query = {

0 commit comments

Comments
 (0)