From 1432fd8a8cfa1b599db03c281f862cbac921a785 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 24 Sep 2021 00:29:28 +0900 Subject: [PATCH] Fix unit tests incompatible with puppetlab-stdlib 8.0.0 Since puppetlabs-stdlib 8.0.0, ensure_packages automatically translates 'ensure => present' to 'ensure => installed' and that translation breaks existing assertions in unit tests. Change-Id: I23d6e6d23b5f4aa691731daea6b0318ec46c5610 --- spec/defines/cinder_backend_dellemc_vmax_spec.rb | 2 +- spec/defines/cinder_backend_rbd_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/defines/cinder_backend_dellemc_vmax_spec.rb b/spec/defines/cinder_backend_dellemc_vmax_spec.rb index e0518fd3..28756e3d 100644 --- a/spec/defines/cinder_backend_dellemc_vmax_spec.rb +++ b/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') } diff --git a/spec/defines/cinder_backend_rbd_spec.rb b/spec/defines/cinder_backend_rbd_spec.rb index 0fd187d9..ad2e4886 100644 --- a/spec/defines/cinder_backend_rbd_spec.rb +++ b/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])