From 6c4faf84a6ead5452002ac754923cf55537c39b6 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 24 Jul 2022 00:32:24 +0900
Subject: [PATCH] Revert "CentOS 9: Disable unit tests dependent on
 puppet-postgresql"

This reverts commit f016d7261cfdc115acdcb86352b277dc01295dd7.

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: Iae81321d06d05ccb7f85fe982a017580480146e6
---
 spec/classes/gnocchi_db_postgresql_spec.rb | 10 ++++------
 spec/classes/gnocchi_db_spec.rb            | 11 ++++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/spec/classes/gnocchi_db_postgresql_spec.rb b/spec/classes/gnocchi_db_postgresql_spec.rb
index 6117e815..9bd08630 100644
--- a/spec/classes/gnocchi_db_postgresql_spec.rb
+++ b/spec/classes/gnocchi_db_postgresql_spec.rb
@@ -35,15 +35,13 @@ describe 'gnocchi::db::postgresql' do
     context "on #{os}" do
       let (:facts) do
         facts.merge(OSDefaults.get_facts({
-          :os_workers => 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_configures 'gnocchi::db::postgresql'
-      end
+      it_configures 'gnocchi::db::postgresql'
     end
   end
 
diff --git a/spec/classes/gnocchi_db_spec.rb b/spec/classes/gnocchi_db_spec.rb
index 02017480..4f8a2117 100644
--- a/spec/classes/gnocchi_db_spec.rb
+++ b/spec/classes/gnocchi_db_spec.rb
@@ -103,7 +103,11 @@ describe 'gnocchi::db' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge!(OSDefaults.get_facts())
+        facts.merge!(OSDefaults.get_facts({
+          # puppet-postgresql requires the service_provider fact provided by
+          # puppetlabs-postgresql.
+          :service_provider => 'systemd'
+        }))
       end
 
       let(:platform_params) do
@@ -115,10 +119,7 @@ describe 'gnocchi::db' do
         end
       end
 
-      # TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
-      unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
-        it_behaves_like 'gnocchi::db'
-      end
+      it_behaves_like 'gnocchi::db'
       it_behaves_like "gnocchi::db on #{facts[:osfamily]}"
     end
   end