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

This reverts commit c12186f850.

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: I3f4b076bcd4754adfce0fba4117cf1bf26a1649f
This commit is contained in:
Takashi Kajinami 2022-07-24 01:06:48 +09:00
parent 088f49c2ca
commit 7b2f0656a4
1 changed files with 4 additions and 7 deletions

View File

@ -32,15 +32,12 @@ describe 'ec2api::db::postgresql' do
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts({
:processorcount => 8,
: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_behaves_like 'ec2api::db::postgresql'
end
it_behaves_like 'ec2api::db::postgresql'
end
end