From be5de490906e1b2b542ba6e0160672f92a24ab60 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 21 Feb 2014 07:45:55 +0000 Subject: logger.rb: DST * lib/logger.rb (next_rotate_time, previous_period_end): consider DST change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/logger/test_logdevice.rb | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'test') diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb index 3db3a5da45..0245d03eba 100644 --- a/test/logger/test_logdevice.rb +++ b/test/logger/test_logdevice.rb @@ -362,6 +362,44 @@ class TestLogDevice < Test::Unit::TestCase end end + def test_shifting_dst_change + Dir.mktmpdir do |tmpdir| + system({"TZ"=>"Europe/London"}, EnvUtil.rubybin, *%W"--disable=gems -rlogger -C#{tmpdir} -e", <<-'end;') + begin + module FakeTime + attr_accessor :now + end + + class << Time + prepend FakeTime + end + + log = "log" + File.open(log, "w") {} + + Time.now = Time.mktime(2014, 3, 30, 0, 1, 1) + File.utime(Time.now, Time.now, log) + + dev = Logger::LogDevice.new(log, shift_age: 'daily') + dev.write("#{Time.now} hello-1\n") + File.utime(*[Time.mktime(2014, 3, 30, 0, 2, 3)]*2, log) + + Time.now = Time.mktime(2014, 3, 31, 0, 1, 1) + File.utime(Time.now, Time.now, log) + dev.write("#{Time.now} hello-2\n") + ensure + dev.close + end + end; + + log = File.join(tmpdir, "log") + cont = File.read(log) + assert_match(/hello-2/, cont) + assert_not_match(/hello-1/, cont) + assert_file.exist?(log+".20140330") + end + end + private def run_children(n, args, src) -- cgit v1.2.3