From d0852758bb9ca39494eafd383b2b6a78990b5c08 Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Fri, 8 Aug 2014 11:35:10 -0700 Subject: [PATCH 1/2] Call install_* methods only once in spec_helper_acceptance --- spec/spec_helper_acceptance.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 370de46c0..976a60559 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -3,16 +3,19 @@ unless ENV['RS_PROVISION'] == 'no' + foss_opts = { :version => '3.6.2', + :facter_version => '2.1.0', + :hiera_version => '1.3.4', + :default_action => 'gem_install' } + + if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end + hosts.each do |host| if host['platform'] =~ /debian/ on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc' end - if host.is_pe? - install_pe - else - install_puppet - on host, "mkdir -p #{host['distmoduledir']}" - end + + on host, "mkdir -p #{host['distmoduledir']}" end end From 05370c247250cba765ed03dc5eee0a1cbda75522 Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Fri, 8 Aug 2014 13:17:14 -0700 Subject: [PATCH 2/2] Don't support acceptance testing against apache on windows or osx --- spec/spec_helper_acceptance.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 976a60559..8af525245 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -3,10 +3,9 @@ unless ENV['RS_PROVISION'] == 'no' - foss_opts = { :version => '3.6.2', - :facter_version => '2.1.0', - :hiera_version => '1.3.4', - :default_action => 'gem_install' } + # This will install the latest available package on el and deb based + # systems fail on windows and osx, and install via gem on other *nixes + foss_opts = { :default_action => 'gem_install' } if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end