diff options
author | Thiago Oliveira <thiagoo@yahoo-inc.com> | 2014-10-17 14:28:52 -0700 |
---|---|---|
committer | Thiago Oliveira <thiagoo@yahoo-inc.com> | 2014-10-17 14:28:52 -0700 |
commit | 8be7f51256ca5117d4fcb4fb1fab6233c84e0ddf (patch) | |
tree | 2cab112f342df7f4c08aa1725bdfee29f57b79e2 | |
parent | 901e8eff95c953b91f597e4d83932d5b8803d31a (diff) | |
download | chef-8be7f51256ca5117d4fcb4fb1fab6233c84e0ddf.tar.gz |
use group_name when checking if the group exists on mac osx with dscl
-rw-r--r-- | lib/chef/provider/group/dscl.rb | 4 | ||||
-rw-r--r-- | spec/unit/provider/group/dscl_spec.rb | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/chef/provider/group/dscl.rb b/lib/chef/provider/group/dscl.rb index 04ca9bc929..e06c090f50 100644 --- a/lib/chef/provider/group/dscl.rb +++ b/lib/chef/provider/group/dscl.rb @@ -41,10 +41,10 @@ class Chef def load_current_resource @current_resource = Chef::Resource::Group.new(@new_resource.name) - @current_resource.group_name(@new_resource.name) + @current_resource.group_name(@new_resource.group_name) group_info = nil begin - group_info = safe_dscl("read /Groups/#{@new_resource.name}") + group_info = safe_dscl("read /Groups/#{@new_resource.group_name}") rescue Chef::Exceptions::Group @group_exists = false Chef::Log.debug("#{@new_resource} group does not exist") diff --git a/spec/unit/provider/group/dscl_spec.rb b/spec/unit/provider/group/dscl_spec.rb index 8848a01bf2..f2b602ee97 100644 --- a/spec/unit/provider/group/dscl_spec.rb +++ b/spec/unit/provider/group/dscl_spec.rb @@ -252,7 +252,7 @@ describe Chef::Provider::Group::Dscl do lambda { @provider.process_resource_requirements }.should_not raise_error end end - + describe "when creating the group" do it "creates the group, password field, gid, and sets group membership" do @provider.should_receive(:set_gid).and_return(true) @@ -301,7 +301,8 @@ describe 'Test DSCL loading' do @node = Chef::Node.new @events = Chef::EventDispatch::Dispatcher.new @run_context = Chef::RunContext.new(@node, {}, @events) - @new_resource = Chef::Resource::Group.new("aj") + @new_resource = Chef::Resource::Group.new("group name aj") + @new_resource.group_name("aj") @provider = Chef::Provider::Group::Dscl.new(@new_resource, @run_context) @output = <<-EOF AppleMetaNodeLocation: /Local/Default |