[Test Runner] Refactors skippable tasks when waiting for pending

Author: picandocodigo

elasticsearch-api/api-spec-testing/wipe_cluster.rb

@@ -156,7 +156,7 @@ def wait_for_pending_rollup_tasks(client)
 
             time = Time.now.to_i
             results.each do |task|
-              next if task.empty?
+              next if task.empty? || skippable_task?(task)
 
               logger.debug("Pending task: #{task}")
               count += 1 if task.include?(filter)
@@ -277,8 +277,8 @@ def wait_for_cluster_tasks(client)
           loop do
             results = client.cluster.pending_tasks
             results['tasks'].each do |task|
-              names = ['health-node', 'cluster:monitor/tasks/lists', 'create-index-template-v2']
-              next if task.empty? || names.select { |n| task['source'].match? n }.any?
+
+              next if task.empty? || skippable_task?(task)
 
               logger.debug "Pending cluster task: #{task}"
               count += 1
@@ -287,6 +287,16 @@ def wait_for_cluster_tasks(client)
           end
         end
 
+        def skippable_task?(task)
+          names = ['health-node', 'cluster:monitor/tasks/lists', 'create-index-template-v2',
+                   'remove-component-template']
+          if task.is_a?(String)
+            names.select { |n| task.match? n }.any?
+          elsif task.is_a?(Hash)
+            names.select { |n| task['source'].match? n }.any?
+          end
+        end
+
         def delete_all_ilm_policies(client)
           policies = client.ilm.get_lifecycle
           policies.each do |policy|