From 65ed82d4ea0372a2a54e1bea5d10ad8f660d1813 Mon Sep 17 00:00:00 2001 From: nahi Date: Sat, 13 Nov 2004 23:50:46 +0000 Subject: Sun Nov 14 08:46:33 2004 NAKAMURA, Hiroshi * test/logger/test_logger.rb: Logger just expects Logger#datetime_format to be used for Time#strftime independently of locale. [ruby-dev:24828] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/logger/test_logger.rb | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6785173db..11c0894f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Nov 14 08:46:33 2004 NAKAMURA, Hiroshi + + * test/logger/test_logger.rb: Logger just expects + Logger#datetime_format to be used for Time#strftime independently of + locale. [ruby-dev:24828] + Fri Nov 12 17:32:07 2004 NAKAMURA Usaku * bcc32/README.bcc32, win32/README.win32: need bison instead of diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb index ed1270cf3..c953a89d9 100644 --- a/test/logger/test_logger.rb +++ b/test/logger/test_logger.rb @@ -90,9 +90,15 @@ class TestLogger < Test::Unit::TestCase logger = Logger.new(dummy) log = log_add(logger, INFO, "foo") assert_match(/^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d.\s*\d+ $/, log.datetime) - logger.datetime_format = "%d%b%Y@%H:%M:%S" + # [ruby-dev:24828] + #logger.datetime_format = "%d%b%Y@%H:%M:%S" + #log = log_add(logger, INFO, "foo") + #assert_match(/^\d\d\w\w\w\d\d\d\d@\d\d:\d\d:\d\d$/, log.datetime) + # + # don't run the next test at 23:59, or just run again if failed. + logger.datetime_format = "@%d%b%Y@" log = log_add(logger, INFO, "foo") - assert_match(/^\d\d\w\w\w\d\d\d\d@\d\d:\d\d:\d\d$/, log.datetime) + assert_equal(Time.now.strftime("@%d%b%Y@"), log.datetime) logger.datetime_format = "" log = log_add(logger, INFO, "foo") assert_match(/^$/, log.datetime) -- cgit