Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql"

This reverts commit 1b59ffdf7c.

Reason for revert:
puppet-postgresql 8.1.0 was released and now the module supports RHEL 9
(and CentOS 9 effectively).

Note:
This change adds the service_provider fact in test fact data because
it is required by puppet-postgresql.

Depends-on: https://review.opendev.org/850705
Change-Id: If760e88078754476d8b6a1bd8e02a6d1ce9d4df9
This commit is contained in:
Takashi Kajinami 2022-07-24 00:41:33 +09:00
parent 6324800d24
commit 2d2872aef7
1 changed files with 4 additions and 5 deletions

View File

@ -34,14 +34,13 @@ describe 'magnum::db::postgresql' do
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({
:concat_basedir => '/var/lib/puppet/concat'
# puppet-postgresql requires the service_provider fact provided by
# puppetlabs-postgresql.
:service_provider => 'systemd'
}))
end
# TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
it_configures 'magnum::db::postgresql'
end
it_configures 'magnum::db::postgresql'
end
end