Browse Source

Merge "Fix unit tests incompatible with puppetlab-stdlib 8.0.0"

changes/69/811069/1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
70fcbade85
  1. 2
      spec/defines/cinder_backend_dellemc_vmax_spec.rb
  2. 2
      spec/defines/cinder_backend_rbd_spec.rb

2
spec/defines/cinder_backend_dellemc_vmax_spec.rb

@ -17,7 +17,7 @@ describe 'cinder::backend::dellemc_vmax_iscsi' do
shared_examples 'cinder::backend::dellemc_vmax_iscsi' do
context 'dell emc vmax iscsi volume driver' do
it {
is_expected.to contain_package('pywbem').with(:ensure => :present)
is_expected.to contain_package('pywbem').with_ensure('installed')
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/volume_driver').with_value('cinder.volume.drivers.dell_emc.vmax.iscsi.VMAXISCSIDriver')
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml')
}

2
spec/defines/cinder_backend_rbd_spec.rb

@ -28,7 +28,7 @@ describe 'cinder::backend::rbd' do
context 'rbd backend volume driver' do
it {
is_expected.to contain_package('ceph-common').with_ensure('present')
is_expected.to contain_package('ceph-common').with_ensure('installed')
is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/volume_backend_name").with_value(req_params[:volume_backend_name])
is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/volume_driver").with_value('cinder.volume.drivers.rbd.RBDDriver')
is_expected.to contain_cinder_config("#{req_params[:volume_backend_name]}/rbd_ceph_conf").with_value(req_params[:rbd_ceph_conf])

Loading…
Cancel
Save