From 783fced407512dc9a6a51b701c1e61f0be9d7bd9 Mon Sep 17 00:00:00 2001 From: yichizh Date: Fri, 17 May 2019 01:02:39 -0700 Subject: [PATCH] fix the happyhour rule: a more humane way to represent when the double quota days end. --- ocflib/printing/quota.py | 2 +- tests/printing/quota_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ocflib/printing/quota.py b/ocflib/printing/quota.py index f8715b41..e28835a8 100644 --- a/ocflib/printing/quota.py +++ b/ocflib/printing/quota.py @@ -62,7 +62,7 @@ def daily_quota(day=None): if day is None: day = datetime.today() - if HAPPY_HOUR_START <= day and day < HAPPY_HOUR_END: + if HAPPY_HOUR_START <= day and day <= HAPPY_HOUR_END: return HAPPY_HOUR_QUOTA elif day.weekday() in {5, 6}: return WEEKEND_QUOTA diff --git a/tests/printing/quota_test.py b/tests/printing/quota_test.py index f9a0c181..4f5f172b 100644 --- a/tests/printing/quota_test.py +++ b/tests/printing/quota_test.py @@ -54,7 +54,7 @@ # Test "happy hour" quotas ('2017-12-01', WEEKDAY_QUOTA), ('2019-5-6', HAPPY_HOUR_QUOTA), - ('2019-5-16', HAPPY_HOUR_QUOTA), + ('2019-5-17', HAPPY_HOUR_QUOTA), ('2017-12-23', WEEKEND_QUOTA), ]) def test_daily_quota(time, expected):