Merge pull request #726 from DavidS/fix-acceptance-tests

spec_helper_acceptance: Remove conflicting yum install
This commit is contained in:
Bryan Jen 2015-06-18 12:20:43 -07:00
commit e7f3f46640

View file

@ -20,7 +20,6 @@ RSpec.configure do |c|
# Required for binding tests.
if fact('osfamily') == 'RedHat'
version = fact("operatingsystemmajrelease")
shell("yum localinstall -y http://yum.puppetlabs.com/puppetlabs-release-el-#{version}.noarch.rpm")
if fact('operatingsystemmajrelease') =~ /7/ || fact('operatingsystem') =~ /Fedora/
shell("yum install -y bzip2")
end