17d1b767cb
This commit was cherry-picked from Fedora rawhide
<ad7f78b5c8>.
This fixes the test failures related to the Amsterdam time zone like below.
```
1)
Time.local timezone changes correctly adjusts the timezone change to 'CEST' on 'Europe/Amsterdam' FAILED
Expected [0, 0, 0, 16, 5, 1940, 4, 137, true, "WEST"] == [0, 40, 1, 16, 5, 1940, 4, 137, true, "CEST"]
to be truthy but was false
/builddir/build/BUILD/ruby-3.0.4/spec/ruby/core/time/shared/local.rb:13:in `block (5 levels) in <top (required)>'
/builddir/build/BUILD/ruby-3.0.4/spec/ruby/core/time/shared/local.rb:12:in `block (4 levels) in <top (required)>'
/builddir/build/BUILD/ruby-3.0.4/spec/ruby/core/time/local_spec.rb:5:in `<top (required)>'
```
Related: rhbz#2173531
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 7e9ec8a20b0f7469b415283d2ec0c22087f8eb2b Mon Sep 17 00:00:00 2001
|
|
From: Jun Aruga <jaruga@redhat.com>
|
|
Date: Wed, 24 Aug 2022 12:02:56 +0200
|
|
Subject: [PATCH] Fix tests with Europe/Amsterdam pre-1970 time on tzdata
|
|
version 2022b.
|
|
|
|
The Time Zone Database (tzdata) changed the pre-1970 timestamps in some zones
|
|
including Europe/Amsterdam on tzdata version 2022b or later.
|
|
See <https://github.com/eggert/tz/commit/35fa37fbbb152f5dbed4fd5edfdc968e3584fe12>.
|
|
|
|
The tzdata RPM package maintainer on Fedora project suggested changing the Ruby
|
|
test, because the change is intentional.
|
|
See <https://bugzilla.redhat.com/show_bug.cgi?id=2118259#c1>.
|
|
|
|
We use post-1970 time test data to simplify the test.
|
|
---
|
|
core/time/shared/local.rb | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/spec/ruby/core/time/shared/local.rb b/spec/ruby/core/time/shared/local.rb
|
|
index 43f331c4c..c4aa7a7ea 100644
|
|
--- a/spec/ruby/core/time/shared/local.rb
|
|
+++ b/spec/ruby/core/time/shared/local.rb
|
|
@@ -8,10 +8,10 @@ describe :time_local, shared: true do
|
|
|
|
platform_is_not :windows do
|
|
describe "timezone changes" do
|
|
- it "correctly adjusts the timezone change to 'CEST' on 'Europe/Amsterdam'" do
|
|
+ it "correctly adjusts the timezone change to 'CET' on 'Europe/Amsterdam'" do
|
|
with_timezone("Europe/Amsterdam") do
|
|
- Time.send(@method, 1940, 5, 16).to_a.should ==
|
|
- [0, 40, 1, 16, 5, 1940, 4, 137, true, "CEST"]
|
|
+ Time.send(@method, 1970, 5, 16).to_a.should ==
|
|
+ [0, 0, 0, 16, 5, 1970, 6, 136, false, "CET"]
|
|
end
|
|
end
|
|
end
|
|
--
|
|
2.36.1
|
|
|