summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorTravis Fields <travis@puppetlabs.com>2014-11-04 14:17:03 -0800
committerTravis Fields <travis@puppetlabs.com>2014-11-04 14:17:03 -0800
commit4bff0d2d61b8b31cd132fdc7896f115ef2b96770 (patch)
tree5d23f9b06e0f55680235f04900a06a8a6952f8d2 /spec
parent35c2dc7ca340c106872459788c167d04140158ca (diff)
parent2f3d426ba7ad2c3055e4774aa71c77c65e866c43 (diff)
downloadpuppet-stdlib-4bff0d2d61b8b31cd132fdc7896f115ef2b96770.tar.gz
puppet-stdlib-4bff0d2d61b8b31cd132fdc7896f115ef2b96770.tar.bz2
Merge branch '4.3.x'
Conflicts: spec/acceptance/ensure_packages_spec.rb spec/acceptance/ensure_resource_spec.rb
Diffstat (limited to 'spec')
-rwxr-xr-xspec/acceptance/ensure_packages_spec.rb2
-rwxr-xr-xspec/acceptance/ensure_resource_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/acceptance/ensure_packages_spec.rb b/spec/acceptance/ensure_packages_spec.rb
index 9d39220..3651f29 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('operatingsystem') != 'windows') do
+describe 'ensure_packages function', :unless => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) || fact('osfamily') == 'windows') 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..f1bfa54 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 => (UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) || fact('osfamily') == 'windows') do
describe 'success' do
it 'ensure_resource a package' do
apply_manifest('package { "rake": ensure => absent, provider => "gem", }')