X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Fspec%2Fspec_helper_acceptance.rb;h=c52c39be1c660af4d5fc882ed3456db8130ece4a;hb=cd460754b2216a0531071902e1412024c594d72c;hp=aaf76a04a76004730b06e3b7817b98ee98fe430f;hpb=921e69100a563cf143f56a3905d8362336d939ff;p=mirror%2Fdsa-puppet.git diff --git a/3rdparty/modules/rabbitmq/spec/spec_helper_acceptance.rb b/3rdparty/modules/rabbitmq/spec/spec_helper_acceptance.rb index aaf76a04a..c52c39be1 100644 --- a/3rdparty/modules/rabbitmq/spec/spec_helper_acceptance.rb +++ b/3rdparty/modules/rabbitmq/spec/spec_helper_acceptance.rb @@ -1,5 +1,4 @@ require 'beaker-rspec' -require 'beaker-puppet' require 'beaker/puppet_install_helper' require 'beaker/module_install_helper' @@ -10,7 +9,7 @@ install_module install_module_dependencies # Install aditional modules for soft deps -install_module_from_forge('puppetlabs-apt', '>= 4.1.0 < 7.0.0') if fact('os.family') == 'Debian' +install_module_from_forge('puppetlabs-apt', '>= 4.1.0 < 5.0.0') if fact('os.family') == 'Debian' install_module_from_forge('garethr-erlang', '>= 0.3.0 < 1.0.0') if fact('os.family') == 'RedHat' RSpec.configure do |c| @@ -18,7 +17,6 @@ RSpec.configure do |c| c.formatter = :documentation c.before :suite do hosts.each do |host| - install_package(host, 'iproute2') if fact('os.release.major').to_i == 18 if fact('os.family') == 'RedHat' && fact('selinux') == 'true' # Make sure selinux is disabled so the tests work. on host, puppet('apply', '-e',