mirror of
https://github.com/github/rails.git
synced 2026-01-26 06:48:59 -05:00
Don't run 32bit dependant assertions in 64bit environments
Signed-off-by: Michael Koziarski <michael@koziarski.com>
This commit is contained in:
committed by
Michael Koziarski
parent
6ef35461dc
commit
671bbd962e
@@ -524,13 +524,12 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
|
||||
assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
|
||||
assert_equal Time.time_with_datetime_fallback(:local, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
|
||||
assert_equal Time.time_with_datetime_fallback(:utc, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, 0, 0)
|
||||
assert_equal Time.time_with_datetime_fallback(:local, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
|
||||
assert_equal Time.time_with_datetime_fallback(:utc, 2005), Time.utc(2005)
|
||||
assert_equal Time.time_with_datetime_fallback(:utc, 2039), DateTime.civil(2039, 1, 1, 0, 0, 0, 0, 0)
|
||||
assert_equal Time.time_with_datetime_fallback(:utc, 2005, 2, 21, 17, 44, 30, 1), Time.utc(2005, 2, 21, 17, 44, 30, 1) #with usec
|
||||
# This won't overflow on 64bit linux
|
||||
expected_to_overflow = Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1)
|
||||
unless expected_to_overflow.is_a?(Time)
|
||||
unless time_is_64bits?
|
||||
assert_equal Time.time_with_datetime_fallback(:local, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
|
||||
assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1),
|
||||
DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
|
||||
assert_equal ::Date::ITALY, Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1).start # use Ruby's default start value
|
||||
@@ -546,7 +545,10 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
|
||||
def test_local_time
|
||||
assert_equal Time.local_time(2005, 2, 21, 17, 44, 30), Time.local(2005, 2, 21, 17, 44, 30)
|
||||
assert_equal Time.local_time(2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
|
||||
assert_equal Time.local_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
|
||||
|
||||
unless time_is_64bits?
|
||||
assert_equal Time.local_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
|
||||
end
|
||||
end
|
||||
|
||||
def test_next_month_on_31st
|
||||
@@ -624,6 +626,10 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
|
||||
ensure
|
||||
old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
|
||||
end
|
||||
|
||||
def time_is_64bits?
|
||||
Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1).is_a?(Time)
|
||||
end
|
||||
end
|
||||
|
||||
class TimeExtMarshalingTest < Test::Unit::TestCase
|
||||
|
||||
Reference in New Issue
Block a user