From 2e294c7f4806166e35ed08dd4f47b5b479030407 Mon Sep 17 00:00:00 2001 From: jordanbreen28 Date: Thu, 15 Jun 2023 17:19:37 +0100 Subject: [PATCH] (CONT-347) - address CI failures --- spec/acceptance/db_spec.rb | 4 ++++ spec/acceptance/default_parameters_spec.rb | 4 ++++ spec/acceptance/overridden_settings_spec.rb | 4 ++++ spec/acceptance/server/config_entry_spec.rb | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/spec/acceptance/db_spec.rb b/spec/acceptance/db_spec.rb index e3d5549b28..51fe5825af 100644 --- a/spec/acceptance/db_spec.rb +++ b/spec/acceptance/db_spec.rb @@ -3,6 +3,10 @@ require 'spec_helper_acceptance' describe 'postgresql::server::db' do + before(:all) do + LitmusHelper.instance.run_shell("cd /tmp; su 'postgres' -c 'pg_ctl stop -D /var/lib/pgsql/data/ -m fast'", acceptable_exit_codes: [0, 1]) unless os[:family].match?(%r{debian|ubuntu}) + end + it 'creates a database' do tmpdir = run_shell('mktemp').stdout pp = <<-MANIFEST diff --git a/spec/acceptance/default_parameters_spec.rb b/spec/acceptance/default_parameters_spec.rb index c69a3c6dd2..41eb6c9774 100644 --- a/spec/acceptance/default_parameters_spec.rb +++ b/spec/acceptance/default_parameters_spec.rb @@ -5,6 +5,10 @@ # These tests are designed to ensure that the module, when ran with defaults, # sets up everything correctly and allows us to connect to Postgres. describe 'postgresql::server' do + before(:all) do + LitmusHelper.instance.run_shell("cd /tmp; su 'postgres' -c 'pg_ctl stop -D /var/lib/pgsql/data/ -m fast'", acceptable_exit_codes: [0, 1]) unless os[:family].match?(%r{debian|ubuntu}) + end + it 'with defaults' do pp = <<-MANIFEST class { 'postgresql::server': } diff --git a/spec/acceptance/overridden_settings_spec.rb b/spec/acceptance/overridden_settings_spec.rb index bec2f6908d..74695a49e2 100644 --- a/spec/acceptance/overridden_settings_spec.rb +++ b/spec/acceptance/overridden_settings_spec.rb @@ -5,6 +5,10 @@ # These tests are designed to ensure that the module, when ran overrides, # sets up everything correctly and allows us to connect to Postgres. describe 'postgresql::server' do + before(:all) do + LitmusHelper.instance.run_shell("cd /tmp; su 'postgres' -c 'pg_ctl stop -D /var/lib/pgsql/data/ -m fast'", acceptable_exit_codes: [0, 1]) unless os[:family].match?(%r{debian|ubuntu}) + end + let(:pp) do <<-MANIFEST class { 'postgresql::server': diff --git a/spec/acceptance/server/config_entry_spec.rb b/spec/acceptance/server/config_entry_spec.rb index 20c14ef627..de034c01a2 100644 --- a/spec/acceptance/server/config_entry_spec.rb +++ b/spec/acceptance/server/config_entry_spec.rb @@ -3,6 +3,10 @@ require 'spec_helper_acceptance' describe 'postgresql::server::config_entry' do + before(:all) do + LitmusHelper.instance.run_shell("cd /tmp; su 'postgres' -c 'pg_ctl stop -D /var/lib/pgsql/data/ -m fast'", acceptable_exit_codes: [0, 1]) unless os[:family].match?(%r{debian|ubuntu}) + end + context 'unix_socket_directories' do let(:pp_test) do <<-MANIFEST