From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 23 Jul 2022 16:07:32 +0000 (+0900)
Subject: Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql"
X-Git-Tag: 21.0.0~6
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=588c9c9501216553e458274cf831d2ea7d3be59b;p=puppet-modules%2Fpuppet-ceilometer.git

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

This reverts commit 23ab18bfb6f53e39665770e9588826f61d919dbb.

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: I4165cdb8062f22ec73fca94e184bd42960c8bead
---

diff --git a/spec/classes/ceilometer_db_postgresql_spec.rb b/spec/classes/ceilometer_db_postgresql_spec.rb
index 44d6e72..298dd25 100644
--- a/spec/classes/ceilometer_db_postgresql_spec.rb
+++ b/spec/classes/ceilometer_db_postgresql_spec.rb
@@ -35,14 +35,13 @@ describe 'ceilometer::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 'ceilometer::db::postgresql'
-      end
+      it_configures 'ceilometer::db::postgresql'
     end
   end