Skip to content
This repository was archived by the owner on Aug 24, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions celerybeatmongo/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
# use this file except in compliance with the License. You may obtain a copy
# of the License at http://www.apache.org/licenses/LICENSE-2.0

import datetime
from datetime import datetime, timedelta
from mongoengine import *
from mongoengine import signals

from celery import current_app
import celery.schedules

Expand Down Expand Up @@ -41,7 +43,7 @@ class Interval(EmbeddedDocument):

@property
def schedule(self):
return celery.schedules.schedule(datetime.timedelta(**{self.period: self.every}))
return celery.schedules.schedule(timedelta(**{self.period: self.every}))

@property
def period_singular(self):
Expand Down Expand Up @@ -105,11 +107,22 @@ def __unicode__(self):
max_run_count = IntField(min_value=0, default=0)

date_changed = DateTimeField()
date_creation = DateTimeField()
description = StringField()

run_immediately = BooleanField()
no_changes = False

def save(self, force_insert=False, validate=True, clean=True,
write_concern=None, cascade=None, cascade_kwargs=None,
_refs=None, save_condition=None, signal_kwargs=None, **kwargs):
if not self.date_creation:
self.date_creation = datetime.now()
self.date_changed = datetime.now()
super(PeriodicTask, self).save(force_insert, validate, clean,
write_concern, cascade, cascade_kwargs, _refs,
save_condition, signal_kwargs, **kwargs)

def clean(self):
"""validation by mongoengine to ensure that you only have
an interval or crontab schedule, but not both simultaneously"""
Expand Down
3 changes: 3 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
celery
mongoengine
pymongo
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
'pymongo',
'mongoengine',
'celery',
'blinker'
],
classifiers=[
'Development Status :: 2 - Production/Stable',
Expand Down
29 changes: 28 additions & 1 deletion tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def test_str(self):
self.assertEqual("0 * * 10-15 * (m/h/d/dM/MY)", str(periodic.crontab))


class PeriodicTaskTest(unittest.TestCase):
class PeriodicTaskTest(BeatMongoCase):

def test_must_define_interval_or_crontab(self):
with self.assertRaises(ValidationError) as err:
Expand All @@ -54,3 +54,30 @@ def test_cannot_define_both_interval_and_contrab(self):
with self.assertRaises(ValidationError) as err:
periodic.save()
self.assertTrue("Cannot define both interval and crontab schedule." in err.exception.message)

def test_creation_date(self):
periodic = PeriodicTask(task="foo")
periodic.interval = PeriodicTask.Interval(every=1, period="days")
self.assertIsNone(periodic.date_creation,
"date_creation should be none on the first object instantion")
periodic.save()
self.assertIsNotNone(periodic.date_creation)
date_creation = periodic.date_creation

periodic.name = "I'm changing"
periodic.save()
self.assertEqual(date_creation, periodic.date_creation,
"Update object should not change date_creation value")

def test_date_changed(self):
periodic = PeriodicTask(task="foo")
periodic.interval = PeriodicTask.Interval(every=1, period="days")

self.assertIsNone(periodic.date_changed)
periodic.save()
self.assertIsNotNone(periodic.date_changed)

date_changed = periodic.date_changed
periodic.name = "I'm changing now"
periodic.save()
self.assertGreater(periodic.date_changed, date_changed)