Merge remote-tracking branch 'origin/master' into quinteros

ManageIQ · Dec 7, 2023 · 2745dd8 · 2745dd8
2 parents e862276 + 06c65f0
commit 2745dd8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/app/models/manageiq/providers/vmware/infra_manager/event_catcher/runner.rb b/app/models/manageiq/providers/vmware/infra_manager/event_catcher/runner.rb
@@ -110,8 +110,4 @@ def worker_options
       ]
     )
   end
-
-  def worker_cmdline
-    ManageIQ::Providers::Vmware::Engine.root.join("workers/event_catcher/worker").to_s
-  end
 end
diff --git a/spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb b/spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb
@@ -606,7 +606,7 @@ def host_config_storage_device_stub(host)
         storage_device_yml = vcr_cassettes_dir.join(*described_class.name.underscore.split("::"), "host_storageDevice.yml")
         allow(host).to receive(:collect!)
           .with("config.storageDevice.hostBusAdapter", "config.storageDevice.scsiLun", "config.storageDevice.scsiTopology.adapter")
-          .and_return(YAML.load_file(storage_device_yml))
+          .and_return(YAML.unsafe_load(File.read(storage_device_yml)))
       end
 
       def vm_power_off_object_update

diff --git a/spec/workers/event_catcher/event_parser_spec.rb b/spec/workers/event_catcher/event_parser_spec.rb
@@ -80,7 +80,7 @@
   private
 
   def load_event(event_name)
-    YAML.load_file(event_data_dir.join("#{event_name}.yml"))
+    YAML.unsafe_load(File.read(event_data_dir.join("#{event_name}.yml")))
   end
 
   def event_data_dir
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,8 +110,4 @@ def worker_options @@
           ]
         )
       end
-      def worker_cmdline
-        ManageIQ::Providers::Vmware::Engine.root.join("workers/event_catcher/worker").to_s
-      end
     end