Skip to content

Commit

Permalink
Merge pull request #353 from cyberious/WindowsTestIsolationFix
Browse files Browse the repository at this point in the history
Fix the unless for test cases on ensure_package and ensure_resource
  • Loading branch information
Morgan Haskel committed Nov 4, 2014
2 parents 0db72ea + 26e864f commit 2f3d426
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion spec/acceptance/ensure_packages_spec.rb
Original file line number Diff line number Diff line change
@@ -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", }')
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/ensure_resource_spec.rb
Original file line number Diff line number Diff line change
@@ -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", }')
Expand Down

0 comments on commit 2f3d426

Please sign in to comment.