From 961ab466f89f199ff720daa58d69ac63e3aa84d8 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 30 Jun 2021 23:23:51 +0100 Subject: [PATCH] test(alma+rocky): add platforms (based on CentOS 8) [skip ci] --- test/integration/default/controls/config.rb | 8 ++++---- test/integration/default/controls/install.rb | 8 ++++---- test/integration/default/controls/service.rb | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index 70f3c4ce..57bc190b 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -4,11 +4,11 @@ config = '/etc/collectd/collectd.conf' -# Override by OS -case os[:name] -when 'redhat', 'fedora', 'centos', 'opensuse', 'oracle' +# Override by platform +case platform[:family] +when 'redhat', 'fedora', 'suse' config = '/etc/collectd.conf' -when 'freebsd' +when 'bsd' config = '/usr/local/etc/collectd.conf' end diff --git a/test/integration/default/controls/install.rb b/test/integration/default/controls/install.rb index 2d9ea6c0..10d0d7bb 100644 --- a/test/integration/default/controls/install.rb +++ b/test/integration/default/controls/install.rb @@ -4,11 +4,11 @@ pkg = 'collectd-core' -# Override by OS -case os[:name] -when 'redhat', 'centos', 'fedora', 'opensuse', 'oracle' +# Override by platform +case platform[:family] +when 'redhat', 'fedora', 'suse' pkg = 'collectd' -when 'freebsd' +when 'bsd' pkg = 'collectd5' end diff --git a/test/integration/default/controls/service.rb b/test/integration/default/controls/service.rb index 5c4aeca7..3e7e1dfa 100644 --- a/test/integration/default/controls/service.rb +++ b/test/integration/default/controls/service.rb @@ -4,6 +4,7 @@ title 'should be running and enabled' describe service('collectd') do + it { should be_installed } it { should be_enabled } it { should be_running } end