From 38722fa179fcec549300b2f35206f4eb168f202e Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Mon, 14 Oct 2019 18:08:10 -0700
Subject: [ruby/logger] Raise ArgumentError for invalid shift_age

Consider 'now' and 'everytime' as valid values for the previous
behavior of rotating everytime.

Fixes Ruby Bug 15977

https://github.com/ruby/logger/commit/f92979a376
---
 test/logger/test_logdevice.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'test/logger')

diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb
index 428d83c6b2..1f9dfc3292 100644
--- a/test/logger/test_logdevice.rb
+++ b/test/logger/test_logdevice.rb
@@ -275,8 +275,12 @@ class TestLogDevice < Test::Unit::TestCase
     logger.close
   end
 
+  def test_invalid_shifting_age
+    assert_raise(ArgumentError) { Logger.new(@filename, 'invalid') }
+    assert_raise(ArgumentError) { Logger::Period.previous_period_end(Time.now, 'invalid') }
+  end
+
   def test_shifting_age
-    # shift_age other than 'daily', 'weekly', and 'monthly' means 'everytime'
     yyyymmdd = Time.now.strftime("%Y%m%d")
     filename1 = @filename + ".#{yyyymmdd}"
     filename2 = @filename + ".#{yyyymmdd}.1"
@@ -311,7 +315,6 @@ class TestLogDevice < Test::Unit::TestCase
   end
 
   def test_shifting_period_suffix
-    # shift_age other than 'daily', 'weekly', and 'monthly' means 'everytime'
     ['%Y%m%d', '%Y-%m-%d', '%Y'].each do |format|
       if format == '%Y%m%d' # default
         logger = Logger.new(@filename, 'now', 1048576)
-- 
cgit v1.2.3