Browse Source

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
changes/12/758712/1
Takashi Kajinami 10 months ago
parent
commit
2b046eeec6
  1. 14
      spec/classes/nova_compute_libvirt_spec.rb

14
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

Loading…
Cancel
Save