summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppetlabs.com>2014-06-23 18:58:37 -0700
committerHunter Haugen <hunter@puppetlabs.com>2014-06-23 18:58:37 -0700
commit0427248cf0f93b4ec9b371616b335b4918066cbb (patch)
treeddafe1b85bd8286d8517079db268d40605ff9f8f
parent191f180d1be67593a0758de90fd2ab29e8f68ce7 (diff)
parent78f5141290926aaabec3980aae9d923c7bf1d359 (diff)
Merge pull request #283 from cyberious/4.3.x
Add windows support and work around issue with SCP_TO on windows systems
-rwxr-xr-xspec/spec_helper_acceptance.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 8e56daa..e9ccc68 100755
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -26,6 +26,15 @@ RSpec.configure do |c|
# Configure all nodes in nodeset
c.before :suite do
- puppet_module_install(:source => proj_root, :module_name => 'stdlib')
+ hosts.each do |host|
+ if host['platform'] !~ /windows/i
+ copy_root_module_to(host, :source => proj_root, :module_name => 'stdlib')
+ end
+ end
+ hosts.each do |host|
+ if host['platform'] =~ /windows/i
+ on host, puppet('plugin download')
+ end
+ end
end
end