opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #363 from hunner/fix_windows

Browse source 
Fix exclude windows test on ensure_package
This commit is contained in:
Morgan Haskel 2014-11-11 16:44:26 -08:00
commit ded4d516f1
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/acceptance/ensure_packages_spec.rb
View file

@ -1,7 +1,7 @@
#! /usr/bin/env ruby -S rspec #! /usr/bin/env ruby -S rspec
require 'spec_helper_acceptance' require 'spec_helper_acceptance'
describe 'ensure_packages function', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) && fact('osfamily') != 'windows') do describe 'ensure_packages function', :unless => fact('osfamily') =~ /windows/i do
describe 'success' do describe 'success' do
it 'ensure_packages a package' do it 'ensure_packages a package' do
apply_manifest('package { "rake": ensure => absent, provider => "gem", }') apply_manifest('package { "rake": ensure => absent, provider => "gem", }')

2
spec/acceptance/ensure_resource_spec.rb
View file

@ -1,7 +1,7 @@
#! /usr/bin/env ruby -S rspec #! /usr/bin/env ruby -S rspec
require 'spec_helper_acceptance' require 'spec_helper_acceptance'
describe 'ensure_resource function', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) && fact('osfamily') != 'windows') do describe 'ensure_resource function', :unless => fact('osfamily') =~ /windows/i do
describe 'success' do describe 'success' do
it 'ensure_resource a package' do it 'ensure_resource a package' do
apply_manifest('package { "rake": ensure => absent, provider => "gem", }') apply_manifest('package { "rake": ensure => absent, provider => "gem", }')

29
spec/spec_helper_acceptance.rb
View file

@ -4,15 +4,23 @@ require 'beaker-rspec'
UNSUPPORTED_PLATFORMS = [] UNSUPPORTED_PLATFORMS = []
unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no' unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
# This will install the latest available package on el and deb based foss_opts = {
# systems fail on windows and osx, and install via gem on other *nixes :default_action => 'gem_install',
foss_opts = { :default_action => 'gem_install' } :version => (ENV['PUPPET_VERSION'] ? ENV['PUPPET_VERSION'] : '3.7.2'),
}
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| hosts.each do |host|
on host, "mkdir -p #{host['distmoduledir']}" if host['platform'] !~ /windows/i
on host, "/bin/touch #{host['puppetpath']}/hiera.yaml" if host.is_pe?
on host, 'mkdir -p /etc/puppetlabs/facter/facts.d'
else
on host, "/bin/touch #{host['puppetpath']}/hiera.yaml"
on host, "mkdir -p #{host['distmoduledir']}"
on host, 'mkdir -p /etc/facter/facts.d'
end
end
end end
end end
@ -29,17 +37,8 @@ RSpec.configure do |c|
default[:default_apply_opts] ||= {} default[:default_apply_opts] ||= {}
default[:default_apply_opts].merge!({:parser => 'future'}) default[:default_apply_opts].merge!({:parser => 'future'})
end end
hosts.each do |host|
if host['platform'] !~ /windows/i
copy_root_module_to(host, :source => proj_root, :module_name => 'stdlib')
end
end copy_root_module_to(default, :source => proj_root, :module_name => 'stdlib')
hosts.each do |host|
if host['platform'] =~ /windows/i
on host, puppet('plugin download')
end
end
end end
end end