diff options
| author | Travis Fields <travis@puppetlabs.com> | 2014-11-04 10:42:34 -0800 |
|---|---|---|
| committer | Travis Fields <travis@puppetlabs.com> | 2014-11-04 10:45:13 -0800 |
| commit | 26e864f22457de1291f06b0086db7afc8d6dcfeb (patch) | |
| tree | 5dcbdf045efbd6c52cc25754561c6cc0d205c570 | |
| parent | 0db72ea777145cb69ce66dca3ae0ee5746c26934 (diff) | |
| download | puppet-stdlib-26e864f22457de1291f06b0086db7afc8d6dcfeb.tar.gz puppet-stdlib-26e864f22457de1291f06b0086db7afc8d6dcfeb.tar.bz2 | |
Fix the unless for test cases on ensure_package and ensure_resource
Conflicts:
spec/acceptance/ensure_packages_spec.rb
spec/acceptance/ensure_resource_spec.rb
| -rwxr-xr-x | spec/acceptance/ensure_packages_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/acceptance/ensure_resource_spec.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/spec/acceptance/ensure_packages_spec.rb b/spec/acceptance/ensure_packages_spec.rb index 53c1035..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 2aad243..26409fe 100755 --- a/spec/acceptance/ensure_resource_spec.rb +++ b/spec/acceptance/ensure_resource_spec.rb @@ -1,7 +1,8 @@ #! /usr/bin/env ruby -S rspec require 'spec_helper_acceptance' -describe 'ensure_resource function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) 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", }') |