merge revision(s) 36636:

* test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-10-25 09:11:09 +00:00
parent 2c40007895
commit 73c592d570
3 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,7 @@
Thu Oct 25 17:55:01 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil.
Thu Oct 25 16:59:17 2012 Luis Lavena <luislavena@gmail.com>
* test/ruby/test_file_exhaustive.rb: fix test introduced in r36811 for

View file

@ -38,7 +38,7 @@ class TestEtc < Test::Unit::TestCase
assert_include(s, Etc.getpwuid(uid))
end
s = passwd[Process.euid]
if s
unless s.empty?
assert_include(s, Etc.getpwuid)
end
end

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 298
#define RUBY_PATCHLEVEL 299
#define RUBY_RELEASE_DATE "2012-10-25"
#define RUBY_RELEASE_YEAR 2012