From 49a53e4cd7eb4c606e7ba08839a499fd40569cd7 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Fri, 7 Jul 2017 15:11:23 +0200 Subject: [PATCH] Fix non-zero-padded days in tests See https://github.com/CartoDB/dataservices-api/issues/204 and related tickets. --- .../python/cartodb_services/test/metrics/test_quota.py | 8 ++++---- server/lib/python/cartodb_services/test/test_helper.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/lib/python/cartodb_services/test/metrics/test_quota.py b/server/lib/python/cartodb_services/test/metrics/test_quota.py index c379a82..079c31d 100644 --- a/server/lib/python/cartodb_services/test/metrics/test_quota.py +++ b/server/lib/python/cartodb_services/test/metrics/test_quota.py @@ -35,7 +35,7 @@ class TestQuotaChecker(TestCase): soft_limit = False ) 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 def test_routing_quota_check_fails_when_quota_exhausted(self): @@ -48,7 +48,7 @@ class TestQuotaChecker(TestCase): soft_limit = False ) 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) assert checker.check() == False @@ -66,7 +66,7 @@ class TestQuotaChecker(TestCase): soft_limit = False ) 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) assert checker.check() == False @@ -80,6 +80,6 @@ class TestQuotaChecker(TestCase): soft_limit = True ) 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) assert checker.check() == True diff --git a/server/lib/python/cartodb_services/test/test_helper.py b/server/lib/python/cartodb_services/test/test_helper.py index 87beef2..fa7f6bd 100644 --- a/server/lib/python/cartodb_services/test/test_helper.py +++ b/server/lib/python/cartodb_services/test/test_helper.py @@ -73,7 +73,7 @@ def increment_service_uses(redis_conn, username, orgname=None, yearmonth = date.strftime('%Y%m') redis_name = "{0}:{1}:{2}:{3}:{4}".format(prefix, entity_name, service, metric, yearmonth) - redis_conn.zincrby(redis_name, date.day, amount) + redis_conn.zincrby(redis_name, date.strftime('%d'), amount) def plpy_mock_config():