More refactoring

django_q/tests/test_cached.py

@@ -1,11 +1,11 @@
+from django_q.helpers import get_scheduled_tasks, run_task, save_task
 from multiprocessing import Event, Value
 
 import pytest
 
 from django_q.brokers import get_broker
-from django_q.cluster import monitor, pusher, worker
 from django_q.conf import Conf
-from django_q.queues import Queue
+from queue import Queue
 from django_q.tasks import (
     AsyncTask,
     Chain,
@@ -54,20 +54,14 @@ def test_cached(broker):
     # run a single inline cluster
     task_count = 17
     assert broker.queue_size() == task_count
-    task_queue = Queue()
-    stop_event = Event()
-    stop_event.set()
-    for i in range(task_count):
-        pusher(task_queue, stop_event, broker=broker)
+    tasks = []
+    for task in range(17):
+        tasks += get_scheduled_tasks(broker=broker)
     assert broker.queue_size() == 0
-    assert task_queue.qsize() == task_count
-    task_queue.put("STOP")
-    result_queue = Queue()
-    worker(task_queue, result_queue, Value("f", -1))
-    assert result_queue.qsize() == task_count
-    result_queue.put("STOP")
-    monitor(result_queue)
-    assert result_queue.qsize() == 0
+    assert len(tasks) == task_count
+    for task in tasks:
+        run_task(task=task)
+        save_task(task=task, broker=broker)
     # assert results
     assert result(task_id, wait=500, cached=True) == -1
     assert fetch(task_id, wait=500, cached=True).result == -1