diff options
author | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-05-07 18:03:57 -0400 |
---|---|---|
committer | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-05-07 18:03:57 -0400 |
commit | 17a912ea0afb3fb018170477856c25a95009f2cc (patch) | |
tree | 91f4a1910df1dfd5729a2a9ad8dbf4ec3fa0402e /spec/spec_helper_acceptance.rb | |
parent | 176ff3abdc1e63de02d6d8d9cb2d70c09f7b7766 (diff) | |
parent | c66a2e4f49d6c9ebcbff718f3ec119049fb4c514 (diff) | |
download | puppet-stdlib-17a912ea0afb3fb018170477856c25a95009f2cc.tar.gz puppet-stdlib-17a912ea0afb3fb018170477856c25a95009f2cc.tar.bz2 |
Merge pull request #247 from hunner/more_tests
Adding more spec coverage
Diffstat (limited to 'spec/spec_helper_acceptance.rb')
-rwxr-xr-x[-rw-r--r--] | spec/spec_helper_acceptance.rb | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index f388729..8e56daa 100644..100755 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -4,14 +4,16 @@ require 'beaker-rspec' UNSUPPORTED_PLATFORMS = [] unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no' + if hosts.first.is_pe? + install_pe + on hosts, 'mkdir -p /etc/puppetlabs/facter/facts.d' + else + install_puppet + on hosts, 'mkdir -p /etc/facter/facts.d' + on hosts, '/bin/touch /etc/puppet/hiera.yaml' + end hosts.each do |host| - # Install Puppet - if host.is_pe? - install_pe - else - install_puppet - on host, "mkdir -p #{host['distmoduledir']}" - end + on host, "mkdir -p #{host['distmoduledir']}" end end @@ -24,10 +26,6 @@ RSpec.configure do |c| # Configure all nodes in nodeset c.before :suite do - # Install module and dependencies puppet_module_install(:source => proj_root, :module_name => 'stdlib') - hosts.each do |host| - shell('/bin/touch /etc/puppet/hiera.yaml') - end end end |