Merge pull request #221 from rails/handle-nil-limit

Handle case of concurrency limit not being set in Semaphore

Author: rosa

app/models/solid_queue/semaphore.rb

@@ -70,7 +70,7 @@ def expires_at
         end
 
         def limit
-          job.concurrency_limit
+          job.concurrency_limit || 1
         end
     end
   end

test/integration/instrumentation_test.rb

@@ -10,7 +10,7 @@ class InstrumentationTest < ActiveSupport::TestCase
       travel_to 2.days.from_now
       dispatcher = SolidQueue::Dispatcher.new(polling_interval: 0.1, batch_size: 10).tap(&:start)
 
-      wait_while_with_timeout(0.5.seconds) { SolidQueue::ScheduledExecution.any? }
+      wait_while_with_timeout!(0.5.seconds) { SolidQueue::ScheduledExecution.any? }
       dispatcher.stop
     end
 
@@ -19,13 +19,13 @@ class InstrumentationTest < ActiveSupport::TestCase
   end
 
   test "stopping a worker with claimed executions emits release_claimed events" do
-    StoreResultJob.perform_later(42, pause: SolidQueue.shutdown_timeout + 10.second)
+    StoreResultJob.perform_later(42, pause: SolidQueue.shutdown_timeout + 100.second)
     process = nil
 
     events = subscribed(/release.*_claimed\.solid_queue/) do
       worker = SolidQueue::Worker.new.tap(&:start)
 
-      wait_while_with_timeout(3.seconds) { SolidQueue::ReadyExecution.any? }
+      wait_while_with_timeout!(3.seconds) { SolidQueue::ReadyExecution.any? }
       process = SolidQueue::Process.last
 
       worker.stop
@@ -54,12 +54,12 @@ class InstrumentationTest < ActiveSupport::TestCase
   end
 
   test "starting and stopping a worker emits register_process and deregister_process events" do
-    StoreResultJob.perform_later(42, pause: SolidQueue.shutdown_timeout + 10.second)
+    StoreResultJob.perform_later(42, pause: SolidQueue.shutdown_timeout + 100.second)
     process = nil
 
     events = subscribed(/(register|deregister)_process\.solid_queue/) do
       worker = SolidQueue::Worker.new.tap(&:start)
-      wait_while_with_timeout(3.seconds) { SolidQueue::ReadyExecution.any? }
+      wait_while_with_timeout!(3.seconds) { SolidQueue::ReadyExecution.any? }
 
       process = SolidQueue::Process.last
 

test/test_helper.rb

@@ -85,14 +85,18 @@ def wait_for_process_termination_with_timeout(pid, timeout: 10, exitstatus: 0)
     end
 
     def wait_while_with_timeout(timeout, &block)
+      wait_while_with_timeout!(timeout, &block)
+    rescue Timeout::Error
+    end
+
+    def wait_while_with_timeout!(timeout, &block)
       Timeout.timeout(timeout) do
         skip_active_record_query_cache do
           while block.call
             sleep 0.05
           end
         end
       end
-    rescue Timeout::Error
     end
 
     def signal_process(pid, signal, wait: nil)