aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsonots <sonots@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-18 15:54:45 +0000
committersonots <sonots@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-18 15:54:45 +0000
commitdd4f5901968487051e4cf5f3fdef640fce1a9e35 (patch)
tree832dafbacec875735dabec9004ee2481092716d5
parent7b2d47132ff8ee950b0f978ab772dee868d9f1b0 (diff)
downloadruby-dd4f5901968487051e4cf5f3fdef640fce1a9e35.tar.gz
* test/logger/test_logdevice.rb: fix tests to pass on windows
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/logger/test_logdevice.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb
index bdf611aab4..6c9a52e6a5 100644
--- a/test/logger/test_logdevice.rb
+++ b/test/logger/test_logdevice.rb
@@ -295,10 +295,12 @@ class TestLogDevice < Test::Unit::TestCase
def test_shifting_period_suffix
# shift_age other than 'daily', 'weekly', and 'monthly' means 'everytime'
- {
- "%Y%m%d" => Logger.new(@filename, 'now', 1048576), # default
- "%Y-%m-%d" => Logger.new(@filename, 'now', 1048576, shift_period_suffix: '%Y-%m-%d')
- }.each do |format, logger|
+ ['%Y%m%d', '%Y-%m-%d', '%Y'].each do |format|
+ if format == '%Y%m%d' # default
+ logger = Logger.new(@filename, 'now', 1048576)
+ else # config
+ logger = Logger.new(@filename, 'now', 1048576, shift_period_suffix: format)
+ end
begin
yyyymmdd = Time.now.strftime(format)
filename1 = @filename + ".#{yyyymmdd}"