Fix spec tests for RSpec 3.x and Puppet 4.x

Fix resource array, according[1].
[1]https://github.com/puppetlabs/puppet/blob/3.7.5/lib/puppet/resource.rb#L446-L453

Closes-bug: #1447620
Change-Id: I246a53b90a74aed4b114ffad5ce1995bb9e334dc

diff --git a/spec/classes/ceilometer_agent_central_spec.rb b/spec/classes/ceilometer_agent_central_spec.rb
index c5587626ed648dd0fd24b43a5059d3721c96c5c5..05cb35f21238c9ad9e5e000d49e04d969874b227 100644 (file)
--- a/spec/classes/ceilometer_agent_central_spec.rb
+++ b/spec/classes/ceilometer_agent_central_spec.rb
@@ -22,7 +22,7 @@ describe 'ceilometer::agent::central' do
       is_expected.to contain_package('ceilometer-agent-central').with(
         :ensure => 'latest',
         :name   => platform_params[:agent_package_name],
-        :before => 'Service[ceilometer-agent-central]',
+        :before => ['Service[ceilometer-agent-central]'],
         :tag    => 'openstack'
       )
     end

diff --git a/spec/classes/ceilometer_agent_compute_spec.rb b/spec/classes/ceilometer_agent_compute_spec.rb
index 28325b5af21e37a98e6dc783878162a94111ad07..6b6a42e05978636d8aeeea6ac82f5fc56d70b93d 100644 (file)
--- a/spec/classes/ceilometer_agent_compute_spec.rb
+++ b/spec/classes/ceilometer_agent_compute_spec.rb
@@ -22,7 +22,7 @@ describe 'ceilometer::agent::compute' do
       is_expected.to contain_package('ceilometer-agent-compute').with(
         :ensure => 'installed',
         :name   => platform_params[:agent_package_name],
-        :before => 'Service[ceilometer-agent-compute]',
+        :before => ['Service[ceilometer-agent-compute]'],
         :tag    => 'openstack'
       )
     end
@@ -31,7 +31,7 @@ describe 'ceilometer::agent::compute' do
       if platform_params[:libvirt_group]
         is_expected.to contain_user('ceilometer').with_groups(['nova', "#{platform_params[:libvirt_group]}"])
       else
-        is_expected.to contain_user('ceilometer').with_groups('nova')
+        is_expected.to contain_user('ceilometer').with_groups(['nova'])
       end
     end
 

diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb
index c729031d2dc4c59f8f30b2378fed5754bcf0cb4f..d97159408c4f0a5baa0b6e47cb656e2914ca02b4 100644 (file)
--- a/spec/classes/ceilometer_agent_polling_spec.rb
+++ b/spec/classes/ceilometer_agent_polling_spec.rb
@@ -28,7 +28,7 @@ describe 'ceilometer::agent::polling' do
         if platform_params[:libvirt_group]
           is_expected.to contain_user('ceilometer').with_groups(['nova', "#{platform_params[:libvirt_group]}"])
         else
-          is_expected.to contain_user('ceilometer').with_groups('nova')
+          is_expected.to contain_user('ceilometer').with_groups(['nova'])
         end
       end
 
@@ -56,7 +56,7 @@ describe 'ceilometer::agent::polling' do
       is_expected.to contain_package('ceilometer-polling').with(
         :ensure => 'latest',
         :name   => platform_params[:agent_package_name],
-        :before => /Service\[ceilometer-polling\]/,
+        :before => ['Service[ceilometer-polling]'],
         :tag    => 'openstack'
       )
     end

diff --git a/spec/classes/ceilometer_alarm_evaluator_spec.rb b/spec/classes/ceilometer_alarm_evaluator_spec.rb
index 503956a12ec32c561fdf21a521c2b52543fff851..599bcf4445ab8326a24f66ebf8fc246eade356b8 100644 (file)
--- a/spec/classes/ceilometer_alarm_evaluator_spec.rb
+++ b/spec/classes/ceilometer_alarm_evaluator_spec.rb
@@ -20,7 +20,7 @@ describe 'ceilometer::alarm::evaluator' do
     it { is_expected.to contain_class('ceilometer::params') }
 
     it 'installs ceilometer-alarm package' do
-      is_expected.to contain_package(platform_params[:alarm_evaluator_package_name]).with_before('Service[ceilometer-alarm-evaluator]')
+      is_expected.to contain_package(platform_params[:alarm_evaluator_package_name]).with_before(['Service[ceilometer-alarm-evaluator]'])
       is_expected.to contain_package(platform_params[:alarm_evaluator_package_name]).with(
         :ensure => 'present',
         :name   => platform_params[:alarm_evaluator_package_name],

diff --git a/spec/classes/ceilometer_alarm_notifier_spec.rb b/spec/classes/ceilometer_alarm_notifier_spec.rb
index 2862e5469b700ad419aa2e7812c9cc960b58515a..e0f250a64e48e98720bdb2434f6b657512894d95 100644 (file)
--- a/spec/classes/ceilometer_alarm_notifier_spec.rb
+++ b/spec/classes/ceilometer_alarm_notifier_spec.rb
@@ -21,7 +21,7 @@ describe 'ceilometer::alarm::notifier' do
     it { is_expected.to contain_class('ceilometer::params') }
 
     it 'installs ceilometer-alarm package' do
-      is_expected.to contain_package(platform_params[:alarm_notifier_package_name]).with_before('Service[ceilometer-alarm-notifier]')
+      is_expected.to contain_package(platform_params[:alarm_notifier_package_name]).with_before(['Service[ceilometer-alarm-notifier]'])
       is_expected.to contain_package(platform_params[:alarm_notifier_package_name]).with(
         :ensure => 'present',
         :name   => platform_params[:alarm_notifier_package_name],

diff --git a/spec/classes/ceilometer_collector_spec.rb b/spec/classes/ceilometer_collector_spec.rb
index 7b3261eef784dfbd1cdac5778d0bc3a5c7b0fa74..bd7a9e2c79f077b8ed99191987c7bbc932017441 100644 (file)
--- a/spec/classes/ceilometer_collector_spec.rb
+++ b/spec/classes/ceilometer_collector_spec.rb
@@ -70,8 +70,8 @@ describe 'ceilometer::collector' do
       end
 
       it 'configures relationships on database' do
-        is_expected.to contain_class('ceilometer::db').with_before('Service[ceilometer-collector]')
-        is_expected.to contain_exec('ceilometer-dbsync').with_notify('Service[ceilometer-collector]')
+        is_expected.to contain_class('ceilometer::db').with_before(['Service[ceilometer-collector]'])
+        is_expected.to contain_exec('ceilometer-dbsync').with_notify(['Service[ceilometer-collector]'])
       end
     end