diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-09 13:19:32 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-09 13:19:32 +0000 |
| commit | 855c6b4507ec3906b1d3e2e817f5c2f3819c83d5 (patch) | |
| tree | c662f75548eecb72044ab808b3bcf307d174eced /test | |
| parent | 341d9e5858024f290e8e749aef1fc79c79b2747b (diff) | |
merges r33398 from trunk into ruby_1_9_3.
--
* lib/time.rb (Time.strptime): use Time.at if d[:seconds] is set.
Reported by Christopher Eberz. [ruby-core:39903] Bug #5399
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_time.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/test_time.rb b/test/test_time.rb index d3f3c22dff..9dbce3f654 100644 --- a/test/test_time.rb +++ b/test/test_time.rb @@ -392,6 +392,7 @@ class TestTimeExtension < Test::Unit::TestCase # :nodoc: def test_strptime assert_equal(Time.utc(2005, 8, 28, 06, 54, 20), Time.strptime("28/Aug/2005:06:54:20 +0000", "%d/%b/%Y:%T %z")) + assert_equal(Time.at(1).localtime, Time.strptime("1", "%s")) end def test_nsec |