Write some more tests for jobs that fail, retrying and discarding

Author: rosa

test/dummy/app/jobs/raising_job.rb

@@ -1,16 +1,17 @@
-class DefaultsError < StandardError; end
-class DiscardableError < StandardError; end
-
 class RaisingJob < ApplicationJob
+  class DefaultError < StandardError; end
+  class DiscardableError < StandardError; end
+
   queue_as :background
 
-  retry_on DefaultsError
+  retry_on DefaultError, attempts: 3, wait: 0.1.seconds
   discard_on DiscardableError
 
-  def perform(raising, attempts, *)
+  def perform(raising, identifier, attempts = 1)
     raising = raising.shift if raising.is_a?(Array)
-    if raising && executions < attempts
-      JobBuffer.add("Raised #{raising} for the #{executions.ordinalize} time")
+
+    if raising && executions <= attempts
+      JobBuffer.add("#{identifier}: raised #{raising} for the #{executions.ordinalize} time")
       raise raising, "This is a #{raising} exception"
     else
       JobBuffer.add("Successfully completed job")

test/integration/jobs_lifecycle_test.rb

@@ -27,6 +27,54 @@ class JobsLifecycleTest < ActiveSupport::TestCase
     assert_equal 2, SolidQueue::Job.finished.count
   end
 
+  test "enqueue and run jobs that fail without retries" do
+    RaisingJob.perform_later(RuntimeError, "A")
+    RaisingJob.perform_later(RuntimeError, "B")
+    jobs = SolidQueue::Job.last(2)
+
+    @dispatcher.start
+    @worker.start
+
+    wait_for_jobs_to_finish_for(3.seconds)
+
+    message = "raised RuntimeError for the 1st time"
+    assert_equal [ "A: #{message}", "B: #{message}" ], JobBuffer.values.sort
+
+    assert_empty SolidQueue::Job.finished
+  end
+
+  test "enqueue and run jobs that fail and succeed after retrying" do
+    RaisingJob.perform_later(RaisingJob::DefaultError, "A", 5) # this will fail after being retried
+    RaisingJob.perform_later(RaisingJob::DefaultError, "B")
+
+    @dispatcher.start
+    @worker.start
+
+    wait_for_jobs_to_finish_for(3.seconds)
+
+    messages_from_a = 1.upto(3).collect { |i| "A: raised RaisingJob::DefaultError for the #{i.ordinalize} time" }
+    messages_from_b = [ "B: raised RaisingJob::DefaultError for the 1st time", "Successfully completed job" ]
+
+    assert_equal messages_from_a + messages_from_b, JobBuffer.values.sort
+
+    assert_equal 4, SolidQueue::Job.finished.count # B + its retry + 2 retries of A
+    assert_equal 1, SolidQueue::FailedExecution.count
+  end
+
+  test "enqueue and run jobs that fail and it's discarded" do
+    RaisingJob.perform_later(RaisingJob::DiscardableError, "A")
+
+    @dispatcher.start
+    @worker.start
+
+    wait_for_jobs_to_finish_for(1.seconds)
+
+    assert_equal [ "A: raised RaisingJob::DiscardableError for the 1st time" ], JobBuffer.values.sort
+
+    assert_equal 1, SolidQueue::Job.finished.count
+    assert_equal 0, SolidQueue::FailedExecution.count
+  end
+
   test "schedule and run jobs" do
     AddToBufferJob.set(wait: 1.day).perform_later("I'm scheduled")
     AddToBufferJob.set(wait: 3.days).perform_later("I'm scheduled later")

test/models/solid_queue/claimed_execution_test.rb

@@ -18,7 +18,7 @@ class SolidQueue::ClaimedExecutionTest < ActiveSupport::TestCase
   end
 
   test "perform job that fails" do
-    claimed_execution = prepare_and_claim_job RaisingJob.perform_later(RuntimeError, 2)
+    claimed_execution = prepare_and_claim_job RaisingJob.perform_later(RuntimeError, "A")
     job = claimed_execution.job
 
     assert_difference -> { SolidQueue::ClaimedExecution.count } => -1, -> { SolidQueue::FailedExecution.count } => 1 do
@@ -38,7 +38,7 @@ class SolidQueue::ClaimedExecutionTest < ActiveSupport::TestCase
     subscriber = ErrorBuffer.new
 
     with_error_subscriber(subscriber) do
-      claimed_execution = prepare_and_claim_job RaisingJob.perform_later(RuntimeError, 2)
+      claimed_execution = prepare_and_claim_job RaisingJob.perform_later(RuntimeError, "B")
 
       claimed_execution.perform
     end