Attempt reduce flakiness of processes_lifecycle_test.rb

Author: p-schlickmann

test/integration/processes_lifecycle_test.rb

@@ -125,20 +125,17 @@ class ProcessesLifecycleTest < ActiveSupport::TestCase
 
     wait_while_with_timeout(1.second) { SolidQueue::ReadyExecution.count > 0 }
 
-    signal_process(@pid, :TERM, wait: 0.5)
-
-    sleep(SolidQueue.shutdown_timeout + 0.5.second)
+    signal_process(@pid, :TERM, wait: 0.5.second)
 
+    wait_while_with_timeout!(SolidQueue.shutdown_timeout) { not check_job_status(no_pause, :finished) }
     assert_completed_job_results("no pause")
-    assert_job_status(no_pause, :finished)
 
-    # This job was left claimed as the worker was shutdown without
-    # a chance to terminate orderly
+    # This job was left claimed as the worker was shutdown without a chance to terminate orderly
+    wait_while_with_timeout!(SolidQueue.shutdown_timeout) { not check_job_status(pause, :claimed) }
     assert_started_job_result("pause")
-    assert_job_status(pause, :claimed)
 
     # The process running the long job couldn't deregister, the other did
-    assert_registered_workers_for(:background)
+    wait_for_registered_processes(1, timeout: 3.seconds)
 
     # Now wait until the supervisor finishes for real, which will complete the cleanup
     wait_for_process_termination_with_timeout(@pid, timeout: 1.second)
@@ -313,14 +310,18 @@ def assert_started_job_result(value, queue_name = :background, count = 1)
     end
 
     def assert_job_status(active_job, status)
+      assert check_job_status(active_job, status)
+    end
+
+    def check_job_status(active_job, status)
       # Make sure we skip AR query cache. Otherwise the queries done here
       # might be cached and since we haven't done any non-SELECT queries
       # after they were cached on the connection used in the test, the cache
       # will still apply, even though the data returned by the cached queries
       # might have been deleted in the forked processes.
       skip_active_record_query_cache do
         job = SolidQueue::Job.find_by(active_job_id: active_job.job_id)
-        assert job.public_send("#{status}?")
+        job.public_send("#{status}?")
       end
     end
 end