Show job ended_at (#557)

* First stab at setting up Github actions * Use Redis Github Action * Set working directory * Fixed some tests * Fixed tests * Test with more django versions * Only test with Python >= 3.8 * Use the most recent version of django-redis * Fixed test warnings * add runtime statistics and ended_at field to jobs.html Co-authored-by: pengxiaotao <[email protected]>
rq · Nov 5, 2022 · d9b8ec1 · d9b8ec1
1 parent 5d2a12b
commit d9b8ec1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/django_rq/templates/django_rq/jobs.html b/django_rq/templates/django_rq/jobs.html
@@ -74,6 +74,7 @@
                                 <th><div class = 'text'><span>Scheduled</span></div></th>
                             {% endif %}
                             <th><div class = 'text'><span>Enqueued</span></div></th>
+                            <th><div class = 'text'><span>Ended</span></div></th>
                             <th><div class = 'text'><span>Status</span></div></th>
                             <th><div class = 'text'><span>Callable</span></div></th>
                             {% block extra_columns %}
@@ -108,6 +109,11 @@
                                         {{ job.enqueued_at|to_localtime|date:"Y-m-d, H:i:s" }}
                                     {% endif %}
                                 </td>
+                                <td>
+                                    {% if job.ended_at %}
+                                        {{ job.ended_at|to_localtime|date:"Y-m-d, H:i:s" }}
+                                    {% endif %}
+                                </td>
                                 <td>{{ job.get_status }}</td>
                                 <td>{{ job|show_func_name }}</td>
                                 {% block extra_columns_values %}

diff --git a/django_rq/tests/fixtures.py b/django_rq/tests/fixtures.py
@@ -28,3 +28,7 @@ class DummyScheduler(Scheduler):
 
 def access_self():
     return get_current_job().id
+
+
+def failing_job():
+    raise ValueError
diff --git a/django_rq/tests/test_views.py b/django_rq/tests/test_views.py
@@ -18,7 +18,7 @@
 
 from django_rq import get_queue
 from django_rq.workers import get_worker
-from .fixtures import access_self
+from .fixtures import access_self, failing_job
 from .utils import get_queue_index
 
 
@@ -75,9 +75,6 @@ def test_requeue_job(self):
         """
         Ensure that a failed job gets requeued when rq_requeue_job is called
         """
-        def failing_job():
-            raise ValueError
-
         queue = get_queue('default')
         queue_index = get_queue_index('default')
         job = queue.enqueue(failing_job)
@@ -94,12 +91,9 @@ def test_requeue_all(self):
         """
         Ensure that requeuing all failed job work properly
         """
-        def failing_job():
-            raise ValueError
-
         queue = get_queue('default')
         queue_index = get_queue_index('default')
-        job = queue.enqueue(failing_job)
+        queue.enqueue(failing_job)
         queue.enqueue(failing_job)
         worker = get_worker('default')
         worker.work(burst=True)
@@ -114,9 +108,6 @@ def test_requeue_all_if_deleted_job(self):
         """
         Ensure that requeuing all failed job work properly
         """
-        def failing_job():
-            raise ValueError
-
         queue = get_queue('default')
         queue_index = get_queue_index('default')
         job = queue.enqueue(failing_job)
@@ -188,9 +179,6 @@ def test_enqueue_jobs(self):
         self.assertIsNotNone(last_job.enqueued_at)
 
     def test_action_requeue_jobs(self):
-        def failing_job():
-            raise ValueError
-
         queue = get_queue('django_rq_test')
         queue_index = get_queue_index('django_rq_test')