summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2014-11-11 16:44:26 -0800
committerMorgan Haskel <morgan@puppetlabs.com>2014-11-11 16:44:26 -0800
commitded4d516f15443ef145d64ef5e2b198578f6a190 (patch)
treebeaf5f625bb672bcf57cfe9e06534fb4250eba38
parent202e3707cfdf81b15ec6989fcc3b696e7f01b293 (diff)
parent3584485902c83bbfbc7417b122fe73f80bcd1630 (diff)
downloadpuppet-stdlib-ded4d516f15443ef145d64ef5e2b198578f6a190.tar.gz
puppet-stdlib-ded4d516f15443ef145d64ef5e2b198578f6a190.tar.bz2
Merge pull request #363 from hunner/fix_windows
Fix exclude windows test on ensure_package
-rwxr-xr-xspec/acceptance/ensure_packages_spec.rb2
-rwxr-xr-xspec/acceptance/ensure_resource_spec.rb2
-rwxr-xr-xspec/spec_helper_acceptance.rb29
3 files changed, 16 insertions, 17 deletions
diff --git a/spec/acceptance/ensure_packages_spec.rb b/spec/acceptance/ensure_packages_spec.rb
index ca4b249..aedcfb5 100755
--- a/spec/acceptance/ensure_packages_spec.rb
+++ b/spec/acceptance/ensure_packages_spec.rb
@@ -1,7 +1,7 @@
#! /usr/bin/env ruby -S rspec
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
it 'ensure_packages a package' do
apply_manifest('package { "rake": ensure => absent, provider => "gem", }')
diff --git a/spec/acceptance/ensure_resource_spec.rb b/spec/acceptance/ensure_resource_spec.rb
index c3d72fc..1cee53d 100755
--- a/spec/acceptance/ensure_resource_spec.rb
+++ b/spec/acceptance/ensure_resource_spec.rb
@@ -1,7 +1,7 @@
#! /usr/bin/env ruby -S rspec
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
it 'ensure_resource a package' do
apply_manifest('package { "rake": ensure => absent, provider => "gem", }')
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index ef99723..3203ce9 100755
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -4,15 +4,23 @@ require 'beaker-rspec'
UNSUPPORTED_PLATFORMS = []
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',
+ :version => (ENV['PUPPET_VERSION'] ? ENV['PUPPET_VERSION'] : '3.7.2'),
+ }
if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
hosts.each do |host|
- on host, "mkdir -p #{host['distmoduledir']}"
- on host, "/bin/touch #{host['puppetpath']}/hiera.yaml"
+ if host['platform'] !~ /windows/i
+ 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
@@ -29,17 +37,8 @@ RSpec.configure do |c|
default[:default_apply_opts] ||= {}
default[:default_apply_opts].merge!({:parser => 'future'})
end
- 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
+ copy_root_module_to(default, :source => proj_root, :module_name => 'stdlib')
end
end