diff options
author | Serdar Sutay <serdar@opscode.com> | 2014-09-03 21:44:13 +0300 |
---|---|---|
committer | Serdar Sutay <serdar@opscode.com> | 2014-09-04 01:04:34 +0300 |
commit | d4ab0361d1a609fb687d6e4558166074556f8d7e (patch) | |
tree | 7b8835aca8de93a9ce290eae3c721c97bf365082 | |
parent | 046fcb1cdb34b20c4db1bf282b62b6bf4287ab33 (diff) | |
download | chef-d4ab0361d1a609fb687d6e4558166074556f8d7e.tar.gz |
Merge pull request #1973 from opscode/sersut/group-spec-fix
Check the group membership using dscl on Mac in specs.
Conflicts:
spec/functional/resource/group_spec.rb
-rw-r--r-- | spec/functional/resource/group_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb index 3c2c1a86ba..610227d698 100644 --- a/spec/functional/resource/group_spec.rb +++ b/spec/functional/resource/group_spec.rb @@ -40,6 +40,11 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte when "windows" user_sid = sid_string_from_user(user) user_sid.nil? ? false : Chef::Util::Windows::NetGroup.new(group_name).local_get_members.include?(user_sid) + when "mac_os_x" + membership_info = shell_out("dscl . -read /Groups/#{group_name}").stdout + members = membership_info.split(" ") + members.shift # Get rid of GroupMembership: string + members.include?(user) else Etc::getgrnam(group_name).mem.include?(user) end @@ -420,4 +425,3 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" } end end end - |