Merge pull request #22660 from jrafanie/ensure_not_yet_paused_provide…

…r_destroys_run_medium_priority_and_extended_timeout

Ensure provider destroy requeue has long timeout

app/models/ext_management_system.rb

@@ -660,7 +660,7 @@ def destroy_queue(queue_options = {})
       :message => msg
     )
 
-    orchestrate_destroy_queue(task.id, queue_options.reverse_merge(:msg_timeout => 3_600))
+    orchestrate_destroy_queue(task.id, queue_options)
 
     task.id
   end
@@ -686,7 +686,7 @@ def wait_for_ems_workers_removal
   end
 
   def orchestrate_destroy_queue(task_id, queue_options = {})
-    self.class._queue_task('orchestrate_destroy', [id], task_id, queue_options)
+    self.class._queue_task('orchestrate_destroy', [id], task_id, queue_options.reverse_merge(:msg_timeout => 3_600))
   end
 
   def orchestrate_destroy(task_id = nil)

spec/models/ext_management_system_spec.rb

@@ -753,7 +753,10 @@
     it "destroys the ems when no active worker exists" do
       ems.destroy_queue
 
-      expect(MiqQueue.count).to eq(2)
+      # test pauses at high priority
+      # test destroy has extended timeout
+      expect(MiqQueue.where(:method_name => "pause!", :priority => MiqQueue::HIGH_PRIORITY).count).to eq(1)
+      expect(MiqQueue.where(:method_name => "orchestrate_destroy", :msg_timeout => 3_600).count).to eq(1)
 
       deliver_queue_message # Deliver the `#pause!` queue item
       deliver_queue_message # Deliver the `#orchestrate_destroy` queue item
@@ -785,7 +788,8 @@
       deliver_queue_message(MiqQueue.find_by(:method_name => "orchestrate_destroy"))
       deliver_queue_message
 
-      expect(MiqQueue.count).to eq(1)
+      # test non-nil deliver on and extended timeout
+      expect(MiqQueue.where(:msg_timeout => 3_600).where.not(:deliver_on => nil).count).to eq(1)
       expect(ExtManagementSystem.count).to eq(1)
 
       deliver_queue_message