cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-zero-padded days in tests

Browse Source 
See https://github.com/CartoDB/dataservices-api/issues/204 and related
tickets.
This commit is contained in:
Rafa de la Torre
2017-07-07 15:14:27 +02:00
parent 074234b8da
commit 49a53e4cd7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/lib/python/cartodb_services/test/metrics/test_quota.py
+4 -4
View File
@@ -35,7 +35,7 @@ class TestQuotaChecker(TestCase):
soft_limit = False soft_limit = False
) )
redis_conn = MockRedis() redis_conn = MockRedis()
redis_conn.zincrby(self.redis_key, self.period_end_date.day, 999) redis_conn.zincrby(self.redis_key, self.period_end_date.strftime('%d'), 999)
assert QuotaChecker(user_service_config, redis_conn).check() == True assert QuotaChecker(user_service_config, redis_conn).check() == True
def test_routing_quota_check_fails_when_quota_exhausted(self): def test_routing_quota_check_fails_when_quota_exhausted(self):
@@ -48,7 +48,7 @@ class TestQuotaChecker(TestCase):
soft_limit = False soft_limit = False
) )
redis_conn = MockRedis() redis_conn = MockRedis()
redis_conn.zincrby(self.redis_key, self.period_end_date.day, 1001) redis_conn.zincrby(self.redis_key, self.period_end_date.strftime('%d'), 1001)
checker = QuotaChecker(user_service_config, redis_conn) checker = QuotaChecker(user_service_config, redis_conn)
assert checker.check() == False assert checker.check() == False
@@ -66,7 +66,7 @@ class TestQuotaChecker(TestCase):
soft_limit = False soft_limit = False
) )
redis_conn = MockRedis() redis_conn = MockRedis()
redis_conn.zincrby(self.redis_key, self.period_end_date.day, 1000) redis_conn.zincrby(self.redis_key, self.period_end_date.strftime('%d'), 1000)
checker = QuotaChecker(user_service_config, redis_conn) checker = QuotaChecker(user_service_config, redis_conn)
assert checker.check() == False assert checker.check() == False
@@ -80,6 +80,6 @@ class TestQuotaChecker(TestCase):
soft_limit = True soft_limit = True
) )
redis_conn = MockRedis() redis_conn = MockRedis()
redis_conn.zincrby(self.redis_key, self.period_end_date.day, 1001) redis_conn.zincrby(self.redis_key, self.period_end_date.strftime('%d'), 1001)
checker = QuotaChecker(user_service_config, redis_conn) checker = QuotaChecker(user_service_config, redis_conn)
assert checker.check() == True assert checker.check() == True
server/lib/python/cartodb_services/test/test_helper.py
+1 -1
View File
@@ -73,7 +73,7 @@ def increment_service_uses(redis_conn, username, orgname=None,
yearmonth = date.strftime('%Y%m') yearmonth = date.strftime('%Y%m')
redis_name = "{0}:{1}:{2}:{3}:{4}".format(prefix, entity_name, redis_name = "{0}:{1}:{2}:{3}:{4}".format(prefix, entity_name,
service, metric, yearmonth) service, metric, yearmonth)
redis_conn.zincrby(redis_name, date.day, amount) redis_conn.zincrby(redis_name, date.strftime('%d'), amount)
def plpy_mock_config(): def plpy_mock_config():