From f4a5fac0d2671ec98f50a561eefd4ca3702f7cb1 Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Thu, 24 Aug 2023 09:57:16 -0700 Subject: [PATCH] [rubygems/rubygems] Ruby 2.6 compat https://github.com/rubygems/rubygems/commit/1a84960af3 --- test/rubygems/test_gem_safe_marshal.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/rubygems/test_gem_safe_marshal.rb b/test/rubygems/test_gem_safe_marshal.rb index 5a381b0107..fb272877f5 100644 --- a/test/rubygems/test_gem_safe_marshal.rb +++ b/test/rubygems/test_gem_safe_marshal.rb @@ -84,10 +84,12 @@ class TestGemSafeMarshal < Gem::TestCase Time.at(secs, 1.00001, :nanosecond), Time.at(secs, 1.00001, :nanosecond), ].tap do |times| - times.concat [ - Time.at(secs, in: "UTC"), - Time.at(secs, in: "Z"), - ] unless RUBY_ENGINE == "truffleruby" && RUBY_ENGINE_VERSION < "23" + unless RUBY_ENGINE == "truffleruby" && RUBY_ENGINE_VERSION < "23" || RUBY_VERSION < "2.7" + times.concat [ + Time.at(secs, in: "UTC"), + Time.at(secs, in: "Z"), + ] + end end.each_with_index do |t, i| define_method("test_time_#{i} #{t.inspect}") do pend "Marshal.load of Time with custom zone is broken before Truffleruby 23" if t.zone.nil? && RUBY_ENGINE == "truffleruby" && RUBY_ENGINE_VERSION < "23"