From 7b2f0656a4579c491e865f7ef04e64eb1abb9ff7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 24 Jul 2022 01:06:48 +0900 Subject: [PATCH] Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql" This reverts commit c12186f850af136659ce0f4c0d82dfcebca16385. 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 --- spec/classes/ec2api_db_postgresql_spec.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/spec/classes/ec2api_db_postgresql_spec.rb b/spec/classes/ec2api_db_postgresql_spec.rb index 8d31925..a635b7b 100644 --- a/spec/classes/ec2api_db_postgresql_spec.rb +++ b/spec/classes/ec2api_db_postgresql_spec.rb @@ -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