From af99a5c558b09d4a75219d19773460ecdc3aaa2f Mon Sep 17 00:00:00 2001 From: Leos Stejskal Date: Mon, 18 Nov 2024 09:51:14 +0100 Subject: [PATCH] Fixes #38017 - Update libvirt gems & fix tests Gems: * Use fog-libvirt 0.13.0 * Use ruby-libvirt 0.8.3 Tests: * Use "test:///default" for testing * Fix failing tests --- bundler.d/libvirt.rb | 2 +- test/controllers/hosts_controller_test.rb | 3 --- test/unit/compute_resource_host_importer_test.rb | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bundler.d/libvirt.rb b/bundler.d/libvirt.rb index 80b3f8c5a12..fd8315e2bbe 100644 --- a/bundler.d/libvirt.rb +++ b/bundler.d/libvirt.rb @@ -1,4 +1,4 @@ group :libvirt do - gem 'fog-libvirt', '>= 0.12.0' + gem 'fog-libvirt', '>= 0.13.1' gem 'ruby-libvirt', '~> 0.5', :require => 'libvirt' end diff --git a/test/controllers/hosts_controller_test.rb b/test/controllers/hosts_controller_test.rb index f3e2a414d3f..e512cf27bcd 100644 --- a/test/controllers/hosts_controller_test.rb +++ b/test/controllers/hosts_controller_test.rb @@ -1218,9 +1218,6 @@ def test_submit_multiple_rebuild_config_pessimistic context 'Fog.mock!' do setup do Fog.mock! - Foreman::Model::Libvirt.any_instance.stubs(:hypervisor).returns(stub(:hypervisor)) - Foreman::Model::Libvirt.any_instance.expects(:max_cpu_count).returns(10) - Foreman::Model::Libvirt.any_instance.expects(:max_memory).returns(10000000000) end teardown { Fog.unmock! } diff --git a/test/unit/compute_resource_host_importer_test.rb b/test/unit/compute_resource_host_importer_test.rb index a255175178f..8b86443a680 100644 --- a/test/unit/compute_resource_host_importer_test.rb +++ b/test/unit/compute_resource_host_importer_test.rb @@ -75,11 +75,11 @@ class ComputeResourceHostImporterTest < ActiveSupport::TestCase context 'on libvirt' do let(:compute_resource) { FactoryBot.build(:libvirt_cr) } - let(:uuid) { 'fog-449765558356062' } + let(:uuid) { '6695eb01-f6a4-8304-79aa-97f2502e193f' } test 'imports the VM with all parameters' do - assert_equal 'fog-dom1', host.name - assert_equal 'dom.uuid', host.uuid + assert_equal 'test', host.name + assert_equal uuid, host.uuid assert_nil host.domain assert_equal 'aa:bb:cc:dd:ee:ff', host.mac assert_empty host.primary_interface.compute_attributes