summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-03-10 16:52:51 -0700
committerJay Mundrawala <jdmundrawala@gmail.com>2015-03-10 16:52:51 -0700
commitb335f9ba57d6b35e5aeec783efa79d9a7b644583 (patch)
treea1db873b19e9e07f94037a9810fdd6559ef19792
parente88c653016a1f0c5a115c762d9f727fcdfc59d43 (diff)
parentedf9c27323b2c4375d516abb345fd9a541f267dc (diff)
downloadchef-b335f9ba57d6b35e5aeec783efa79d9a7b644583.tar.gz
Merge pull request #3052 from chef/jdm/dscl-fix
dscl specs should only run on mac
-rw-r--r--spec/functional/resource/user/dscl_spec.rb2
-rw-r--r--spec/spec_helper.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/functional/resource/user/dscl_spec.rb b/spec/functional/resource/user/dscl_spec.rb
index f091a0ebac..5d960daf11 100644
--- a/spec/functional/resource/user/dscl_spec.rb
+++ b/spec/functional/resource/user/dscl_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
require 'chef/mixin/shell_out'
metadata = {
- :unix_only => true,
+ :mac_osx_only => true,
:requires_root => true,
:not_supported_on_mac_osx_106 => true,
}
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 12b7db55da..0695450142 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -115,6 +115,7 @@ RSpec.configure do |config|
config.filter_run_excluding :windows_only => true unless windows?
config.filter_run_excluding :not_supported_on_mac_osx_106 => true if mac_osx_106?
config.filter_run_excluding :not_supported_on_mac_osx=> true if mac_osx?
+ config.filter_run_excluding :mac_osx_only=> true if !mac_osx?
config.filter_run_excluding :not_supported_on_win2k3 => true if windows_win2k3?
config.filter_run_excluding :not_supported_on_solaris => true if solaris?
config.filter_run_excluding :win2k3_only => true unless windows_win2k3?