paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 03:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable back door for clearing user's rate-limit history.

Browse Source 
(This is helpful to make the tests run faster.)

(imported from commit 48c1beaed8cca76976bd6f54224c33460b55ceac)
This commit is contained in:
Steve Howell
2013-06-20 17:18:39 -04:00
parent 9ca7d58cac
commit 67058cc26f
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zephyr/lib/rate_limiter.py
View File

@@ -54,6 +54,14 @@ def unblock_user(user, domain='all'):
_, _, blocking_key = redis_key(user, domain)
client.delete(blocking_key)
def clear_user_history(user, domain='all'):
'''
This is only used by test code now, where it's very helpful in
allowing us to run tests quickly, by giving a user a clean slate.
'''
for key in redis_key(user, domain):
client.delete(key)
def _get_api_calls_left(user, domain, range_seconds, max_calls):
list_key, set_key, _ = redis_key(user, domain)
# Count the number of values in our sorted set

19
zephyr/tests.py
View File

@@ -16,6 +16,7 @@ from zephyr.lib.actions import do_send_message, gather_subscriptions, \
create_stream_if_needed, do_add_subscription
from zephyr.lib.rate_limiter import add_ratelimit_rule, remove_ratelimit_rule
from zephyr.lib import bugdown
from zephyr.lib.rate_limiter import clear_user_history
from django.conf import settings
import optparse
@@ -2897,14 +2898,12 @@ class RateLimitTests(AuthedTestCase):
"subject": "Test subject",
"email": email,
"api-key": api_key})
@slow(1.1, 'has to sleep to work')
def test_headers(self):
email = "hamlet@humbughq.com"
user = self.get_user_profile(email)
clear_user_history(user)
api_key = self.get_api_key(email)
# Sleep 1 second and succeed again
time.sleep(1)
result = self.send_api_message(email, api_key, "some stuff")
self.assertTrue('X-RateLimit-Remaining' in result)
self.assertTrue('X-RateLimit-Limit' in result)
@@ -2912,6 +2911,8 @@ class RateLimitTests(AuthedTestCase):
def test_ratelimit_decrease(self):
email = "hamlet@humbughq.com"
user = self.get_user_profile(email)
clear_user_history(user)
api_key = self.get_api_key(email)
result = self.send_api_message(email, api_key, "some stuff")
limit = int(result['X-RateLimit-Remaining'])
@@ -2923,8 +2924,11 @@ class RateLimitTests(AuthedTestCase):
@slow(1.1, 'has to sleep to work')
def test_hit_ratelimits(self):
email = "cordelia@humbughq.com"
user = self.get_user_profile(email)
clear_user_history(user)
api_key = self.get_api_key(email)
for i in range(10):
for i in range(6):
result = self.send_api_message(email, api_key, "some stuff %s" % (i,))
self.assertEqual(result.status_code, 403)
@@ -2932,8 +2936,11 @@ class RateLimitTests(AuthedTestCase):
self.assertEqual(json.get("result"), "error")
self.assertIn("API usage exceeded rate limit, try again in", json.get("msg"))
# Sleep 1 second and succeed again
# We actually wait a second here, rather than force-clearing our history,
# to make sure the rate-limiting code automatically forgives a user
# after some time has passed.
time.sleep(1)
result = self.send_api_message(email, api_key, "Good message")
self.assert_json_success(result)