flake8

Author: cunla

Diff for: scheduler/models/scheduled_task.py

@@ -46,7 +46,8 @@ def success_callback(job, connection, result, *args, **kwargs):
     task = model.objects.filter(job_id=job.id).first()
     if task is None:
         return
-    task.schedule()
+    task.job_id = None
+    task.save(schedule_job=True)
 
 
 class BaseTask(models.Model):
@@ -268,10 +269,10 @@ def save(self, **kwargs):
         update_fields = kwargs.get('update_fields', None)
         if update_fields:
             kwargs['update_fields'] = set(update_fields).union({'modified'})
+        super(BaseTask, self).save(**kwargs)
         if schedule_job:
-            self.schedule()  # schedule() already calls save()
-        else:
-            super(BaseTask, self).save(**kwargs)
+            self.schedule()
+            super(BaseTask, self).save()
 
     def delete(self, **kwargs):
         self.unschedule()

Diff for: scheduler/tests/test_internals.py

@@ -9,9 +9,9 @@
 
 class TestInternals(SchedulerBaseCase):
     def test_get_scheduled_job(self):
-        job = task_factory(ScheduledTask, scheduled_time=timezone.now() - timedelta(hours=1))
-        self.assertEqual(job, get_scheduled_task(job.TASK_TYPE, job.id))
+        task = task_factory(ScheduledTask, scheduled_time=timezone.now() - timedelta(hours=1))
+        self.assertEqual(task, get_scheduled_task(task.TASK_TYPE, task.id))
         with self.assertRaises(ValueError):
-            get_scheduled_task(job.TASK_TYPE, job.id + 1)
+            get_scheduled_task(task.TASK_TYPE, task.id + 1)
         with self.assertRaises(ValueError):
-            get_scheduled_task('UNKNOWN_JOBTYPE', job.id)
+            get_scheduled_task('UNKNOWN_JOBTYPE', task.id)

Diff for: scheduler/tests/test_models.py

@@ -618,14 +618,14 @@ def test_repeat_none_interval_2_min(self):
         self.assertTrue(job.is_scheduled())
 
     def test_check_rescheduled_after_execution(self):
-        job = task_factory(self.TaskModelClass, scheduled_time=timezone.now() + timedelta(seconds=1))
-        queue = job.rqueue
-        first_run_id = job.job_id
+        task = task_factory(self.TaskModelClass, scheduled_time=timezone.now() + timedelta(seconds=1))
+        queue = task.rqueue
+        first_run_id = task.job_id
         entry = queue.fetch_job(first_run_id)
         queue.run_sync(entry)
-        job.refresh_from_db()
-        self.assertTrue(job.is_scheduled())
-        self.assertNotEquals(job.job_id, first_run_id)
+        task.refresh_from_db()
+        self.assertTrue(task.is_scheduled())
+        self.assertNotEquals(task.job_id, first_run_id)
 
 
 class TestCronJob(BaseTestCases.TestBaseJob):