Skip to content

Commit

Permalink
(IAC-785) Back out apache_parameters_spec.rb:96 on Debian 10
Browse files Browse the repository at this point in the history
(IAC-587) Add comment explaining test restrictions
  • Loading branch information
Ciaran McCrisken committed May 12, 2020
1 parent 2f1f9a2 commit 404ae13
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 20 deletions.
40 changes: 20 additions & 20 deletions spec/acceptance/apache_parameters_spec.rb
Expand Up @@ -92,28 +92,28 @@ class { 'apache':
end
end

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

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

# Ensure the default file didn't disappear.
describe file('/etc/apache2/conf-enabled/security.conf') do
it { is_expected.to be_file }
end
# Ensure the default file didn't disappear.
describe file('/etc/apache2/conf-enabled/security.conf') do
it { is_expected.to be_file }
end
end

Expand Down
2 changes: 2 additions & 0 deletions spec/acceptance/vhost_spec.rb
Expand Up @@ -1198,6 +1198,8 @@ class { 'apache::mod::shib': }
end
end

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

0 comments on commit 404ae13

Please sign in to comment.