From 2b046eeec6e064c7189d13e699e92cce0ef386b9 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 19 Oct 2020 16:44:58 +0900 Subject: [PATCH] Do not test nova::migration::libvirt in 2 places Currently behavior of the nova::migration::libvirt class is tested in nova_migration_livirt_spec.rb, thus we don't need to test the same in nova_compute_libvirt_spec.rb. This patch also remove a redundant test case. Change-Id: Iec8f2986e165ccf60f4248cbf91aa8ce20e83a53 --- spec/classes/nova_compute_libvirt_spec.rb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/spec/classes/nova_compute_libvirt_spec.rb b/spec/classes/nova_compute_libvirt_spec.rb index f57345107..41d7e9a62 100644 --- a/spec/classes/nova_compute_libvirt_spec.rb +++ b/spec/classes/nova_compute_libvirt_spec.rb @@ -213,7 +213,6 @@ describe 'nova::compute::libvirt' do it { is_expected.to contain_class('nova::migration::libvirt')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('0.0.0.0')} - it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) } end context 'with vncserver_listen set to ::0' do @@ -224,17 +223,6 @@ describe 'nova::compute::libvirt' do it { is_expected.to contain_class('nova::migration::libvirt')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('::0')} - it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) } - end - - context 'with custom libvirt service name on Debian platforms' do - let :params do - { :libvirt_service_name => 'libvirtd', - :vncserver_listen => '0.0.0.0', - :migration_support => true } - end - it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) } - end end @@ -324,7 +312,6 @@ describe 'nova::compute::libvirt' do it { is_expected.to contain_class('nova::migration::libvirt')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('0.0.0.0')} - it { is_expected.to contain_file_line('/etc/sysconfig/libvirtd libvirtd args').with(:line => 'LIBVIRTD_ARGS="--listen"') } end context 'with vncserver_listen set to ::0' do @@ -335,7 +322,6 @@ describe 'nova::compute::libvirt' do it { is_expected.to contain_class('nova::migration::libvirt')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('::0')} - it { is_expected.to contain_file_line('/etc/sysconfig/libvirtd libvirtd args').with(:line => 'LIBVIRTD_ARGS="--listen"') } end end