Page MenuHomeSoftware Heritage
Files F9696951

No OneTemporary
Actions

View Options

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 713466e..1a44ad8 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,51 +1,61 @@
require 'beaker-rspec/spec_helper'
require 'beaker-rspec/helpers/serverspec'
unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
# 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' }
+ foss_opts = {:default_action => 'gem_install'}
- if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
+ if default.is_pe?; then
+ install_pe;
+ else
+ install_puppet(foss_opts);
+ end
hosts.each do |host|
on hosts, "mkdir -p #{host['distmoduledir']}"
end
end
RSpec.configure do |c|
# Project root
proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
# Readable test descriptions
c.formatter = :documentation
# Configure all nodes in nodeset
c.before :suite do
# Install module and dependencies
hosts.each do |host|
if fact_on(host, 'osfamily') == 'windows'
- on host, 'powershell.exe -command "(New-Object System.Net.Webclient).DownloadString(\'https://forge.puppetlabs.com\')"'
+ pp = <<EOS
+ exec{'download-cert':
+ path => ['C:\Windows\System32\WindowsPowershell\v1.0','C:\Windows\Sysnative\WindowsPowershell\v1.0'],
+ command => 'powershell.exe -command "(New-Object System.Net.Webclient).DownloadString(\"https://forge.puppetlabs.com\")"',
+ }
+EOS
+ apply_manifest_on(host, pp)
end
on host, "mkdir -p #{host['distmoduledir']}/concat"
result = on host, "echo #{host['distmoduledir']}/concat"
target = result.raw_output.chomp
%w(files lib manifests metadata.json).each do |file|
scp_to host, "#{proj_root}/#{file}", target
end
#copy_module_to(host, :source => proj_root, :module_name => 'concat')
- on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
+ on host, puppet('module', 'install', 'puppetlabs-stdlib'), {:acceptable_exit_codes => [0, 1]}
end
end
c.before(:all) do
shell('mkdir -p /tmp/concat')
end
c.after(:all) do
shell('rm -rf /tmp/concat /var/lib/puppet/concat')
end
c.treat_symbols_as_metadata_keys_with_true_values = true
end

File Metadata

Mime Type
text/x-diff
Expires
Mon, Aug 18, 10:16 PM (6 d, 3 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3318864

Event Timeline

About · Developer information · Legal