simple test for monitor

django_q/core.py

@@ -64,6 +64,7 @@ class Cluster(object):
         self.start_event = None
         self.stopped_event = None
         self.pid = current_process().pid
+        self.host = socket.gethostname()
         self.list_key = list_key
         signal.signal(signal.SIGTERM, self.sig_handler)
         signal.signal(signal.SIGINT, self.sig_handler)
@@ -81,6 +82,8 @@ class Cluster(object):
         self.sentinel = Process(target=Sentinel, args=(self.stop_event, self.start_event, self.list_key))
         self.sentinel.start()
         logger.info('Q Cluster-{} starting.'.format(self.pid))
+        while not self.start_event.is_set():
+            sleep(0.2)
         return self.pid
 
     def stop(self):
@@ -329,7 +332,7 @@ def async(func, *args, **kwargs):
 
 class SignedPackage(object):
     """
-    Wraps Django's signing module with custom JsonPickle serializer
+    Wraps Django's signing module with custom Pickle serializer
     """
 
     @staticmethod
@@ -350,7 +353,7 @@ class SignedPackage(object):
 
 class PickleSerializer(object):
     """
-    Simple wrapper around JsonPickle for signing.dumps and
+    Simple wrapper around Pickle for signing.dumps and
     signing.loads.
     """
 

django_q/management/commands/qmonitor.py

@@ -12,7 +12,18 @@ from django_q.core import Stat, RUNNING, STOPPED
 class Command(BaseCommand):
     help = "Monitors cluster activity"
 
+    def add_arguments(self, parser):
+        parser.add_argument('--run-once',
+                            action='store_true',
+                            dest='run_once',
+                            default=False,
+                            help='Run once till first stat')
+
     def handle(self, *args, **options):
+        monitor(run_once=options['run_once'])
+
+
+def monitor(run_once=False):
     term = Terminal()
     with term.fullscreen(), term.hidden_cursor(), term.cbreak():
         val = None
@@ -58,5 +69,8 @@ class Command(BaseCommand):
                                                                 width=col_width - 1))
                 print(term.move(i, 7 * col_width) + term.center('{}'.format(uptime), width=col_width - 1))
                 i += 1
+            # for testing
+            if run_once:
+                return Stat.get_all()
             print(term.move(i + 2, 0) + term.center('[Press q to quit]'))
             val = term.inkey(timeout=1)

django_q/tests/test_admin.py

@@ -0,0 +1,7 @@
+def test_admin_view(admin_client):
+    response = admin_client.get('/admin/django_q/')
+    assert response.status_code == 200
+    response = admin_client.get('/admin/django_q/failure/')
+    assert response.status_code == 200
+    response = admin_client.get('/admin/django_q/success/')
+    assert response.status_code == 200

django_q/tests/test_cluster.py

@@ -20,16 +20,6 @@ class WordClass(object):
     def get_words(self):
         return self.word_list
 
-
-def test_admin_view(admin_client):
-    response = admin_client.get('/admin/django_q/')
-    assert response.status_code == 200
-    response = admin_client.get('/admin/django_q/failure/')
-    assert response.status_code == 200
-    response = admin_client.get('/admin/django_q/success/')
-    assert response.status_code == 200
-
-
 def test_redis_connection():
     assert r.ping() is True
 
@@ -39,13 +29,9 @@ def test_cluster_initial():
     assert c.sentinel is None
     assert c.is_idle
     c.start()
-    while c.is_starting:
-        sleep(0.2)
     assert c.sentinel.is_alive() is True
     assert c.is_running
     c.stop()
-    while c.is_stopping:
-        sleep(0.2)
     assert c.sentinel.is_alive() is False
     assert c.has_stopped
 
@@ -92,8 +78,6 @@ def run_cluster():
     r.delete(list_key)
     c = Cluster(list_key=list_key)
     assert c.start() > 0
-    while not c.is_running:
-        sleep(0.5)
     while c.stat.task_q_size > 0 and c.stat.done_q_size > 0:
         sleep(0.5)
     assert c.stop() is True

django_q/tests/test_monitor.py

@@ -0,0 +1,11 @@
+from django_q.core import Cluster
+from django_q.management.commands.qmonitor import monitor
+
+
+def test_monitor():
+    c = Cluster()
+    c.start()
+    stats = monitor(run_once=True)
+    c.stop()
+    assert len(stats) > 0
+    assert stats[0].cluster_id == c.pid

setup.py

@@ -36,6 +36,7 @@ setup(
     description='A multiprocessing task queue for Django',
     long_description=README,
     install_requires=['django>=1.7', 'redis', 'coloredlogs', 'django-picklefield', 'blessed'],
+    test_requires=['pytest', 'pytest-django', ],
     cmdclass={'test': PyTest},
     classifiers=[
         'Development Status :: 2 - PreAlpha',