diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 16:32:38 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 16:32:38 +0000 |
commit | 22a852a8c0b960578d9e9846a2d11f8940a3f580 (patch) | |
tree | fdba019b49d0a0b2ba78b56a40a83c0564c5d81d | |
parent | ce701babaea99b69e8a90f0dc929c7f60c1bacf2 (diff) |
merge revision(s) 54137,54184: [Backport #12227]
* test/-ext-/time/test_new.rb (test_timespec_new): Time#gmtoff values
are the same only when both or neither of the Time objects are in
summer time (daylight-saving time).
* test/-ext-/time/test_new.rb (test_timespec_new): change a gmtoff
test to a better one that does not depend on whether the current
time is in summer time or not.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | test/-ext-/time/test_new.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,15 @@ +Wed Mar 30 01:32:14 2016 Rei Odaira <Rei.Odaira@gmail.com> + + * test/-ext-/time/test_new.rb (test_timespec_new): change a gmtoff + test to a better one that does not depend on whether the current + time is in summer time or not. + +Wed Mar 30 01:32:14 2016 Rei Odaira <Rei.Odaira@gmail.com> + + * test/-ext-/time/test_new.rb (test_timespec_new): Time#gmtoff values + are the same only when both or neither of the Time objects are in + summer time (daylight-saving time). + Wed Mar 30 01:30:54 2016 Hiroshi Shirosaki <h.shirosaki@gmail.com> * lib/rubygems/test_case.rb: Fix test on Windows for inconsistent temp path. diff --git a/test/-ext-/time/test_new.rb b/test/-ext-/time/test_new.rb index 699201fda5..8283bd6828 100644 --- a/test/-ext-/time/test_new.rb +++ b/test/-ext-/time/test_new.rb @@ -23,7 +23,11 @@ class Bug::Time::Test_New < Test::Unit::TestCase assert_equal(false, Bug::Time.timespec_new(1447087832, 476451125, 0).utc?) assert_equal(true, Bug::Time.timespec_new(1447087832, 476451125, 0x7ffffffe).utc?) assert_equal(false, Bug::Time.timespec_new(1447087832, 476451125, 0x7fffffff).utc?) - assert_equal(Time.now.gmtoff, Bug::Time.timespec_new(1447087832, 476451125, 0x7fffffff).gmtoff) + # Cannot compare Time.now.gmtoff with + # Bug::Time.timespec_new(1447087832, 476451125, 0x7fffffff).gmtoff, because + # it depends on whether the current time is in summer time (daylight-saving time) or not. + t = Time.now + assert_equal(t.gmtoff, Bug::Time.timespec_new(t.tv_sec, t.tv_nsec, 0x7fffffff).gmtoff) assert_time_equal(Time.at(1447087832, 476451.125).localtime(86399), Bug::Time.timespec_new(1447087832, 476451125, 86399)) assert_time_equal(Time.at(1447087832, 476451.125).localtime(-86399), @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-03-30" -#define RUBY_PATCHLEVEL 66 +#define RUBY_PATCHLEVEL 67 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |