diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/etc/test_etc.rb | 6 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Mon Jun 27 01:34:18 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries + start with + sign, which means NIS. these are returned in the + case that passwd and group entries in /etc/nsswitch.conf are set + to use "nis" explicitly on Debian. fixed #3683 + Mon Jun 27 00:44:53 2011 NARUSE, Yui <naruse@ruby-lang.org> * parse.y (rb_parser_end_seen_p): fix documentation about return diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb index 8fb3b485a3..c4db71cdf4 100644 --- a/test/etc/test_etc.rb +++ b/test/etc/test_etc.rb @@ -38,7 +38,9 @@ class TestEtc < Test::Unit::TestCase def test_getpwnam passwd = {} - Etc.passwd {|s| passwd[s.name] ||= s } + Etc.passwd do |s| + passwd[s.name] ||= s unless /\A\+/ =~ s.name + end passwd.each_value do |s| assert_equal(s, Etc.getpwnam(s.name)) end @@ -80,7 +82,7 @@ class TestEtc < Test::Unit::TestCase def test_getgrnam groups = {} Etc.group do |s| - groups[s.name] ||= s + groups[s.name] ||= s unless /\A\+/ =~ s.name end groups.each_value do |s| assert_equal(s, Etc.getgrnam(s.name)) |