From a5849245c6ffb31053ab75ab2e36163674ca7c81 Mon Sep 17 00:00:00 2001 From: shirosaki Date: Mon, 27 Aug 2012 11:57:43 +0000 Subject: [PATCH] test_etc.rb: fix for non unique GID * test/etc/test_etc.rb (TestEtc#test_getgrgid): fix for non unique GID. No unixen systems guarantee that GID is unique. Etc.getgrgid would not return the first entry in the order of Etc.group for shared GID. [ruby-core:47312] [Bug #6935] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/etc/test_etc.rb | 17 +++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 192b99f647..788ced7e0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Aug 27 20:19:49 2012 Hiroshi Shirosaki + + * test/etc/test_etc.rb (TestEtc#test_getgrgid): fix for non unique GID. + No unixen systems guarantee that GID is unique. Etc.getgrgid would + not return the first entry in the order of Etc.group for shared GID. + [ruby-core:47312] [Bug #6935] + Mon Aug 27 18:19:36 2012 Koichi Sasada * include/ruby/ruby.h (rb_float_value): optimize it. diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb index 5bc8db431c..c105122af1 100644 --- a/test/etc/test_etc.rb +++ b/test/etc/test_etc.rb @@ -76,13 +76,18 @@ class TestEtc < Test::Unit::TestCase end def test_getgrgid - groups = {} - Etc.group do |s| - groups[s.gid] ||= s + # group database is not unique on GID, and which entry will be + # returned by getgrgid() is not specified. + groups = Hash.new {[]} + # on MacOSX, same entries are returned from /etc/group and Open + # Directory. + Etc.group {|s| groups[s.gid] |= [s]} + groups.each_pair do |gid, s| + assert_include(s, Etc.getgrgid(gid)) end - groups.each_value do |s| - assert_equal(s, Etc.getgrgid(s.gid)) - assert_equal(s, Etc.getgrgid) if Process.egid == s.gid + s = groups[Process.egid] + unless s.empty? + assert_include(s, Etc.getgrgid) end end