Skip to content

Commit 404ae13

Browse files
author
Ciaran McCrisken
committed
(IAC-785) Back out apache_parameters_spec.rb:96 on Debian 10
(IAC-587) Add comment explaining test restrictions
1 parent 2f1f9a2 commit 404ae13

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

spec/acceptance/apache_parameters_spec.rb

+20-20
Original file line numberDiff line numberDiff line change
@@ -92,28 +92,28 @@ class { 'apache':
9292
end
9393
end
9494

95-
if os[:family] == 'debian'
96-
describe 'conf_enabled => /etc/apache2/conf-enabled' do
97-
pp = <<-MANIFEST
98-
class { 'apache':
99-
purge_configs => false,
100-
conf_enabled => "/etc/apache2/conf-enabled"
101-
}
102-
MANIFEST
103-
it 'applies cleanly' do
104-
run_shell('touch /etc/apache2/conf-enabled/test.conf')
105-
apply_manifest(pp, catch_failures: true)
106-
end
95+
# IAC-785: The Shibboleth mod does not seem to be configured correctly on Debian 10 systems. We should reenable
96+
# this test on Debian 10 systems once the issue has been RCA'd and resolved.
97+
describe 'conf_enabled => /etc/apache2/conf-enabled', if: os[:family] == 'debian' && os[:release].to_i < 10 do
98+
pp = <<-MANIFEST
99+
class { 'apache':
100+
purge_configs => false,
101+
conf_enabled => "/etc/apache2/conf-enabled"
102+
}
103+
MANIFEST
104+
it 'applies cleanly' do
105+
run_shell('touch /etc/apache2/conf-enabled/test.conf')
106+
apply_manifest(pp, catch_failures: true)
107+
end
107108

108-
# Ensure the created file didn't disappear.
109-
describe file('/etc/apache2/conf-enabled/test.conf') do
110-
it { is_expected.to be_file }
111-
end
109+
# Ensure the created file didn't disappear.
110+
describe file('/etc/apache2/conf-enabled/test.conf') do
111+
it { is_expected.to be_file }
112+
end
112113

113-
# Ensure the default file didn't disappear.
114-
describe file('/etc/apache2/conf-enabled/security.conf') do
115-
it { is_expected.to be_file }
116-
end
114+
# Ensure the default file didn't disappear.
115+
describe file('/etc/apache2/conf-enabled/security.conf') do
116+
it { is_expected.to be_file }
117117
end
118118
end
119119

spec/acceptance/vhost_spec.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,8 @@ class { 'apache::mod::shib': }
11981198
end
11991199
end
12001200

1201+
# IAC-587: These tests do not currently run successfully on certain RHEL OSs due to dependency issues with the
1202+
# mod_auth_openidc module.
12011203
describe 'auth_oidc', if: (os[:family] == 'ubuntu' && os[:release].to_i > 14 || os[:family] == 'debian') do
12021204
pp = <<-MANIFEST
12031205
class { 'apache': }

0 commit comments

Comments
 (0)