diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-19 12:29:31 -0700 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-19 12:29:31 -0700 |
commit | e42310c7fb082a20f4155d801e41b980400ae045 (patch) | |
tree | 4c7f1a871a24ca7dbc0378cb17abcc5186952b45 /spec/spec_helper_acceptance.rb | |
parent | 5a61e814677859661b473cea31c51ab8e43cb11c (diff) | |
parent | 84aac457692c18512baab28c8eae00998a7cf9a4 (diff) |
Merge branch '1.0.x'
Diffstat (limited to 'spec/spec_helper_acceptance.rb')
-rw-r--r-- | spec/spec_helper_acceptance.rb | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index c371f1f..e566a12 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -9,6 +9,12 @@ unless ENV['RS_PROVISION'] == 'no' install_puppet on hosts, "mkdir -p #{hosts.first['distmoduledir']}" end + + # We ask the host to interpolate it's distmoduledir because we don't + # actually know it on Windows until we've let it redirect us (depending + # on whether we're running as a 32/64 bit process on 32/64 bit Windows + moduledir = on(host, "echo #{host['distmoduledir']}").stdout.chomp + on host, "mkdir -p #{moduledir}" end end @@ -21,10 +27,12 @@ RSpec.configure do |c| # Configure all nodes in nodeset c.before :suite do - # Install module and dependencies + # Install module and dependencies on all hosts puppet_module_install(:source => proj_root, :module_name => 'vcsrepo') + + # ensure test dependencies are available on all hosts hosts.each do |host| - case fact('osfamily') + case fact_on(host, 'osfamily') when 'RedHat' install_package(host, 'git') when 'Debian' @@ -35,8 +43,8 @@ RSpec.configure do |c| exit end end - shell('git config --global user.email "root@localhost"') - shell('git config --global user.name "root"') + on host, 'git config --global user.email "root@localhost"' + on host, 'git config --global user.name "root"' end end end |