From a7a724e0b4c540ba82be1737d339f9e3d28e3af7 Mon Sep 17 00:00:00 2001 From: Morgan Haskel Date: Fri, 2 May 2014 11:18:20 -0700 Subject: [PATCH] Fix spec_helper_acceptance to work on Ubuntu 14.04. --- spec/spec_helper_acceptance.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 3d99cc36..0a595256 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -2,16 +2,14 @@ UNSUPPORTED_PLATFORMS = [ 'windows', 'Solaris' ] -unless ENV['RS_PROVISION'] == 'no' +unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no' + if hosts.first.is_pe? + install_pe + else + install_puppet + end hosts.each do |host| - # Install Puppet - if host.is_pe? - install_pe - else - install_package host, 'rubygems' - on host, 'gem install puppet --no-ri --no-rdoc' - on host, "mkdir -p #{host['distmoduledir']}" - end + on hosts, "mkdir -p #{host['distmoduledir']}" end end