diff options
-rw-r--r-- | test/etc/test_etc.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb index 374b379fc4..5ac09a781b 100644 --- a/test/etc/test_etc.rb +++ b/test/etc/test_etc.rb @@ -83,23 +83,25 @@ class TestEtc < Test::Unit::TestCase groups = Hash.new {[]} # on MacOSX, same entries are returned from /etc/group and Open # Directory. - Etc.group {|s| groups[s.gid] |= [s]} + Etc.group {|s| groups[s.gid] |= [[s.name, s.gid]]} groups.each_pair do |gid, s| - assert_include(s, Etc.getgrgid(gid)) + g = Etc.getgrgid(gid) + assert_include(s, [g.name, g.gid]) end s = groups[Process.egid] unless s.empty? - assert_include(s, Etc.getgrgid) + g = Etc.getgrgid + assert_include(s, [g.name, g.gid]) end end def test_getgrnam groups = {} Etc.group do |s| - groups[s.name] ||= s unless /\A\+/ =~ s.name + groups[s.name] ||= s.gid unless /\A\+/ =~ s.name end - groups.each_value do |s| - assert_equal(s, Etc.getgrnam(s.name)) + groups.each_pair do |n, s| + assert_equal(s, Etc.getgrnam(n).gid) end end |