Skip to content

Commit

Permalink
(maint) Disable shibb testing on redhats and ipv6 testing without ipv6
Browse files Browse the repository at this point in the history
The shibb package is not in the default repos; broken by puppetlabs#1657

On Dec 12th 2017 travis-ci updated their trusty environment and disabled
ipv6. This causes ipv6 tests to fail.
  • Loading branch information
hunner committed Jan 12, 2018
1 parent c7aa4d5 commit a9cb063
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion spec/acceptance/vhost_spec.rb
Expand Up @@ -1714,7 +1714,7 @@ class { 'apache': }
end
end

describe 'shibboleth parameters' do
describe 'shibboleth parameters', :unless => fact('osfamily') == 'RedHat' do
it 'applies cleanly' do
pp = <<-EOS
class { 'apache': }
Expand Down
4 changes: 4 additions & 0 deletions spec/spec_helper_acceptance.rb
Expand Up @@ -16,6 +16,10 @@
if fact('operatingsystem') == 'Ubuntu' and (fact('operatingsystemrelease') == '10.04' or fact('operatingsystemrelease') == '12.04')
c.filter_run_excluding :ipv6 => true
end
# IPv6 is not enabled by default in the new travis-ci Trusty environment (see https://github.com/travis-ci/travis-ci/issues/8891 )
if fact('network6_lo') != '::1'
c.filter_run_excluding :ipv6 => true
end

# Readable test descriptions
c.formatter = :documentation
Expand Down

0 comments on commit a9cb063

Please sign in to comment.