]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Remove windows from ensure_package and ensure_resource testing
authorTravis Fields <travis@puppetlabs.com>
Mon, 3 Nov 2014 17:30:34 +0000 (09:30 -0800)
committerHunter Haugen <hunter@puppetlabs.com>
Tue, 11 Nov 2014 00:34:05 +0000 (16:34 -0800)
spec/acceptance/ensure_packages_spec.rb
spec/acceptance/ensure_resource_spec.rb

index 3651f292ec509a49ee2bd47063bf51ca3ff88c30..ca4b24902300b4dcffc364a397c44b7bd3412d01 100755 (executable)
@@ -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 => (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", }')
index f1bfa545061cc6fcf7d9d082ca119cb4646e066d..c3d72fc8770f8052f26e2bf08c8402500579624e 100755 (executable)
@@ -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", }')