Hirad/pylast
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improve rate limiting and tests, for #80

Browse source
This commit is contained in:
hugovk 2014-03-03 14:57:15 +02:00
parent a1867cc8d4
commit 40ea12a22f
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pylast.py
View file

@ -302,8 +302,10 @@ class _Network(object):
DELAY_TIME = 0.2 DELAY_TIME = 0.2
now = time.time() now = time.time()
if (now - self.last_call_time) < DELAY_TIME: time_since_last = now - self.last_call_time
time.sleep(now - self.last_call_time - DELAY_TIME)
if time_since_last < DELAY_TIME:
time.sleep(DELAY_TIME - time_since_last)
self.last_call_time = now self.last_call_time = now

13
test_pylast.py
View file

@ -541,9 +541,16 @@ class TestPyLast(unittest.TestCase):
# Act # Act
self.network.enable_rate_limit() self.network.enable_rate_limit()
then = time.time()
# Make some network call, limit not applied first time
self.network.get_user(self.username)
# Make a second network call, limiting should be applied
self.network.get_top_artists()
now = time.time()
# Assert # Assert
self.assertTrue(self.network.is_rate_limited()) self.assertTrue(self.network.is_rate_limited())
self.assertGreaterEqual(now - then, 0.2)
def test_disable_rate_limiting(self): def test_disable_rate_limiting(self):
@ -553,6 +560,12 @@ class TestPyLast(unittest.TestCase):
# Act # Act
self.network.disable_rate_limit() self.network.disable_rate_limit()
then = time.time()
# Make some network call, limit not applied first time
self.network.get_user(self.username)
# Make a second network call, limiting should be applied
self.network.get_top_artists()
now = time.time()
# Assert # Assert
self.assertFalse(self.network.is_rate_limited()) self.assertFalse(self.network.is_rate_limited())