encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-29 01:20:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Wrap test in try/finally, cleanup duration determination

Browse Source
This commit is contained in:
Christopher Grebs 2019-07-30 09:40:32 +02:00
parent 72fbefd853
commit 957b39fa8d
No known key found for this signature in database
GPG Key ID: D7BCDE311BFC58DD
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/views.py
View File

@ -363,10 +363,8 @@ class APIView(View):
if duration is not None if duration is not None
] ]
if durations: duration = max(durations) if durations else None
self.throttled(request, max(durations)) self.throttled(request, duration)
else:
self.throttled(request, None)
def determine_version(self, request, *args, **kwargs): def determine_version(self, request, *args, **kwargs):
""" """

17
tests/test_throttling.py
View File

@ -168,16 +168,17 @@ class ThrottlingTests(TestCase):
assert int(response['retry-after']) == 60 assert int(response['retry-after']) == 60
previous_rate = User3SecRateThrottle.rate previous_rate = User3SecRateThrottle.rate
User3SecRateThrottle.rate = '1/sec' try:
User3SecRateThrottle.rate = '1/sec'
for dummy in range(24): for dummy in range(24):
response = MockView_DoubleThrottling.as_view()(request) response = MockView_DoubleThrottling.as_view()(request)
assert response.status_code == 429 assert response.status_code == 429
assert int(response['retry-after']) == 60 assert int(response['retry-after']) == 60
finally:
# reset # reset
User3SecRateThrottle.rate = previous_rate User3SecRateThrottle.rate = previous_rate
def ensure_response_header_contains_proper_throttle_field(self, view, expected_headers): def ensure_response_header_contains_proper_throttle_field(self, view, expected_headers):
""" """