diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-28 07:30:21 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-28 07:30:21 +0000 |
| commit | bcafeef2e753b4f02bea2e73bd5082bb789bea26 (patch) | |
| tree | 8ab4e0e171474b77012b336b6d1b1a24a973b625 /test | |
| parent | 7149859bc35cfe7497a1e98118f22a1628e8703d (diff) | |
merge revision(s) 48360,48364: [Backport #10493]
* ext/etc/etc.c (etc_getlogin): set login name encoding properly.
[ruby-core:66163] [Bug #10493]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/etc/test_etc.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb index c105122af1..946be9bdf6 100644 --- a/test/etc/test_etc.rb +++ b/test/etc/test_etc.rb @@ -4,7 +4,9 @@ require "etc" class TestEtc < Test::Unit::TestCase def test_getlogin s = Etc.getlogin - assert(s.is_a?(String) || s == nil, "getlogin must return a String or nil") + return if s == nil + assert(s.is_a?(String), "getlogin must return a String or nil") + assert_predicate(s, :valid_encoding?, "login name should be a valid string") end def test_passwd |