Skip to content

Commit 9c0dae1

Browse files
authored
Merge pull request #1446 from puppetlabs/CONT-347-address_cancelled_ci_runs
2 parents be88bbf + 2e294c7 commit 9c0dae1

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

spec/acceptance/db_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
require 'spec_helper_acceptance'
44

55
describe 'postgresql::server::db' do
6+
before(:all) do
7+
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})
8+
end
9+
610
it 'creates a database' do
711
tmpdir = run_shell('mktemp').stdout
812
pp = <<-MANIFEST

spec/acceptance/default_parameters_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
# These tests are designed to ensure that the module, when ran with defaults,
66
# sets up everything correctly and allows us to connect to Postgres.
77
describe 'postgresql::server' do
8+
before(:all) do
9+
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})
10+
end
11+
812
it 'with defaults' do
913
pp = <<-MANIFEST
1014
class { 'postgresql::server': }

spec/acceptance/overridden_settings_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
# These tests are designed to ensure that the module, when ran overrides,
66
# sets up everything correctly and allows us to connect to Postgres.
77
describe 'postgresql::server' do
8+
before(:all) do
9+
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})
10+
end
11+
812
let(:pp) do
913
<<-MANIFEST
1014
class { 'postgresql::server':

spec/acceptance/server/config_entry_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
require 'spec_helper_acceptance'
44

55
describe 'postgresql::server::config_entry' do
6+
before(:all) do
7+
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})
8+
end
9+
610
context 'unix_socket_directories' do
711
let(:pp_test) do
812
<<-MANIFEST

0 commit comments

Comments
 (0)