Skip to content

Fix catch-up checks across partial minutes #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bensynapse wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix catch-up checks across partial minutes #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pycron/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ def has_been(s: str, since: datetime, dt: Optional[datetime] = None) -> bool:
if dt < since:
raise ValueError("The since datetime must be before the current datetime.")

since = since.replace(second=0, microsecond=0)
while since <= dt:
if is_now(s, since):
return True
Expand Down
30 changes: 30 additions & 0 deletions tests/test_has_been.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,33 @@


class HasBeenTestCase(unittest.TestCase):
def test_partial_minutes(self):
cases = [
("1 * * * *", datetime(2026, 1, 1, 0, 0, 59),
datetime(2026, 1, 1, 0, 1, 1)),
("1 * * * *", datetime(2026, 1, 1, 0, 0, 0, 1),
datetime(2026, 1, 1, 0, 1)),
("0 * * * *", datetime(2026, 1, 1, 0, 59, 59),
datetime(2026, 1, 1, 1, 0)),
("0 0 1 1 *", datetime(2025, 12, 31, 23, 59, 59),
datetime(2026, 1, 1)),
]
for expression, since, now in cases:
with self.subTest(expression=expression, since=since, now=now):
self.assertTrue(pycron.has_been(expression, since, now))

def test_partial_minute_boundaries(self):
since = datetime(2026, 1, 1, 0, 0, 59, 500000)
self.assertTrue(pycron.has_been("0 * * * *", since, since))
self.assertFalse(pycron.has_been("1 * * * *", since, since))
self.assertFalse(pycron.has_been(
"1 * * * *", since, datetime(2026, 1, 1, 0, 0, 59, 999999)
))
with self.assertRaises(ValueError):
pycron.has_been(
"* * * * *", since, datetime(2026, 1, 1, 0, 0, 59, 499999)
)

def test_minutes(self):
def run(since, now):
assert pycron.has_been("* * * * *", since, now)
Expand All @@ -17,6 +44,9 @@ def run(since, now):
assert pycron.has_been("2 * * * *", since, now)
assert pycron.has_been("3 * * * *", since, now)
assert pycron.has_been("4 * * * *", since, now) is False
assert pycron.has_been(
"3 * * * *", since.replace(second=59, microsecond=1), now
)

since = datetime(2015, 6, 18, 0, 1)
now = datetime(2015, 6, 18, 0, 3)
Expand Down