Fix bug in scheduler where tasks defined with no params weren't queued properly

Author: sylvinus

mrq/scheduler.py

@@ -13,7 +13,7 @@ def _hash_task(task):
     if params:
         params = json.dumps(sorted(list(task["params"].items()), key=lambda x: x[0]))  # pylint: disable=no-member
 
-    full = [str(task.get(x)) for x in ["path", "interval", "dailytime", "queue"]]
+    full = [str(task.get(x)) for x in ["path", "interval", "dailytime", "weekday", "monthday", "queue"]]
 
     full.extend([str(params)])
     return " ".join(full)
@@ -130,7 +130,7 @@ def check(self):
             if task_data:
                 queue_job(
                     task_data["path"],
-                    task_data["params"],
+                    task_data.get("params") or {},
                     queue=task.get("queue"))
                 log.debug("Scheduler: queued %s" % task_data)
 

tests/fixtures/config-scheduler7.py

@@ -0,0 +1,17 @@
+
+SCHEDULER_TASKS = [
+    {
+        "path": "tests.tasks.general.MongoInsert",
+        "interval": 5
+    },
+    {
+        "path": "tests.tasks.general.MongoInsert",
+        "interval": 6
+    },
+    {
+        "path": "tests.tasks.general.Add",
+        "interval": 5
+    }
+]
+
+SCHEDULER_INTERVAL = 1

tests/test_scheduler.py

@@ -165,3 +165,18 @@ def test_scheduler_monthday(worker):
     inserts = list(collection.find())
     assert len(inserts) == 1
     assert collection.find({"params.monthday": datetime.datetime.utcnow().day}).count() == 1
+
+
+def test_scheduler_noparams(worker):
+    # Task is scheduled in 3 seconds
+    worker.start(
+        flags="--scheduler --config tests/fixtures/config-scheduler7.py"
+    )
+
+    time.sleep(2)
+
+    scheduled_jobs = worker.mongodb_jobs.mrq_scheduled_jobs
+    jobs = worker.mongodb_jobs.mrq_jobs
+
+    assert len(list(scheduled_jobs.find())) == 3
+    assert len(list(jobs.find())) == 3