ruby-changes:73749
From: V=C3=ADt <ko1@a...>
Date: Wed, 28 Sep 2022 02:33:05 +0900 (JST)
Subject: [ruby-changes:73749] bcd30fb961 (master): Re-enable TZ test missed due to merge conflict.
https://git.ruby-lang.org/ruby.git/commit/?id=bcd30fb961 From bcd30fb96192993b629f24a5e551d22067220a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@r...> Date: Fri, 16 Sep 2022 14:06:54 +0200 Subject: Re-enable TZ test missed due to merge conflict. This was disabled by b7577b4d9e, while properly fixed upstream by: https://github.com/ruby/spec/pull/939 --- spec/ruby/core/time/shared/local.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/ruby/core/time/shared/local.rb b/spec/ruby/core/time/shared/local.rb index 2dba23dbd7..c4aa7a7ea9 100644 --- a/spec/ruby/core/time/shared/local.rb +++ b/spec/ruby/core/time/shared/local.rb @@ -6,7 +6,6 @@ describe :time_local, shared: true do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/time/shared/local.rb#L6 end end -=begin platform_is_not :windows do describe "timezone changes" do it "correctly adjusts the timezone change to 'CET' on 'Europe/Amsterdam'" do @@ -17,7 +16,6 @@ describe :time_local, shared: true do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/time/shared/local.rb#L16 end end end -=end end describe :time_local_10_arg, shared: true do -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/