aboutsummaryrefslogtreecommitdiffstats
path: root/test/etc
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-10 08:24:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-10 08:24:36 +0000
commit6ccf3d68c21c2eabefe80f9ff1f7b5296a9ddfd2 (patch)
treed4067ab10ba5b3b857388b3e7f2dbb69e4d41c8f /test/etc
parente899fb19e9a845108c264ecc0e0542d68ce97fe7 (diff)
downloadruby-6ccf3d68c21c2eabefe80f9ff1f7b5296a9ddfd2.tar.gz
win32.c: login name encoding
* 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/trunk@48360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/etc')
-rw-r--r--test/etc/test_etc.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb
index 2f61ac7919..374b379fc4 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