mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
70bbad3cfd
rb_exec_recursive() in eval.c. * eval.c (rb_exec_recursive): new function. * array.c (rb_ary_join): use rb_exec_recursive(). * array.c (rb_ary_inspect, rb_ary_hash): ditto. * file.c (rb_file_join): ditto. * hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto. * io.c (rb_io_puts): ditto. * object.c (rb_obj_inspect): ditto * struct.c (rb_struct_inspect): ditto. * lib/set.rb (SortedSet::setup): a hack to shut up warning. [ruby-talk:132866] * lib/time.rb (Time::strptime): add new function. inspired by [ruby-talk:132815]. * lib/parsedate.rb (ParseDate::strptime): ditto. * regparse.c: move st_*_strend() functions from st.c. fixed some potential memory leaks. * exception error messages updated. [ruby-core:04497] * ext/socket/socket.c (Init_socket): add bunch of Socket constants. Patch from Sam Roberts <sroberts@uniserve.com>. [ruby-core:04409] * array.c (rb_ary_s_create): no need for negative argc check. [ruby-core:04463] * array.c (rb_ary_unshift_m): ditto. * lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass of StandardError class, not Exception class. [ruby-core:04429] * parse.y (fcall_gen): lvar(arg) will be evaluated as lvar.call(arg) when lvar is a defined local variable. [new] * object.c (rb_class_initialize): call inherited method before calling initializing block. * eval.c (rb_thread_start_1): initialize newly pushed frame. * lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE. fixed: [ruby-core:04444] * eval.c (is_defined): NODE_IASGN is an assignment. * ext/readline/readline.c (Readline.readline): use rl_outstream and rl_instream. [ruby-dev:25699] * ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check [ruby-dev:25675] * misc/ruby-mode.el: [ruby-core:04415] * lib/rdoc/generators/html_generator.rb: [ruby-core:04412] * lib/rdoc/generators/ri_generator.rb: ditto. * struct.c (make_struct): fixed: [ruby-core:04402] * ext/curses/curses.c (window_color_set): [ruby-core:04393] * ext/socket/socket.c (Init_socket): SO_REUSEPORT added. [ruby-talk:130092] * object.c: [ruby-doc:818] * parse.y (open_args): fix too verbose warnings for the space before argument parentheses. [ruby-dev:25492] * parse.y (parser_yylex): ditto. * parse.y (parser_yylex): the first expression in the parentheses should not be a command. [ruby-dev:25492] * lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330] * object.c (Init_Object): remove Object#type. [ruby-core:04335] * st.c (st_foreach): report success/failure by return value. [ruby-Bugs-1396] * parse.y: forgot to initialize parser struct. [ruby-dev:25492] * parse.y (parser_yylex): no tLABEL on EXPR_BEG. [ruby-talk:127711] * document updates - [ruby-core:04296], [ruby-core:04301], [ruby-core:04302], [ruby-core:04307] * dir.c (rb_push_glob): should work for NUL delimited patterns. * dir.c (rb_glob2): should aware of offset in the pattern. * string.c (rb_str_new4): should propagate taintedness. * env.h: rename member names in struct FRAME; last_func -> callee, orig_func -> this_func, last_class -> this_class. * struct.c (rb_struct_set): use original method name, not callee name, to retrieve member slot. [ruby-core:04268] * time.c (time_strftime): protect from format modification from GC finalizers. * object.c (Init_Object): remove rb_obj_id_obsolete() * eval.c (rb_mod_define_method): incomplete subclass check. [ruby-dev:25464] * gc.c (rb_data_object_alloc): klass may be NULL. [ruby-list:40498] * bignum.c (rb_big_rand): should return positive random number. [ruby-dev:25401] * bignum.c (rb_big_rand): do not use rb_big_modulo to generate random bignums. [ruby-dev:25396] * variable.c (rb_autoload): [ruby-dev:25373] * eval.c (svalue_to_avalue): [ruby-dev:25366] * string.c (rb_str_justify): [ruby-dev:25367] * io.c (rb_f_select): [ruby-dev:25312] * ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072] * struct.c (make_struct): [ruby-dev:25249] * dir.c (dir_open_dir): new function. [ruby-dev:25242] * io.c (rb_f_open): add type check for return value from to_open. * lib/pstore.rb (PStore#transaction): Use the empty content when a file is not found. [ruby-dev:24561] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
282 lines
7.5 KiB
Ruby
282 lines
7.5 KiB
Ruby
require 'test/unit'
|
|
require 'logger'
|
|
require 'tempfile'
|
|
|
|
|
|
class TestLoggerSeverity < Test::Unit::TestCase
|
|
def test_enum
|
|
logger_levels = Logger.constants
|
|
levels = ["WARN", "UNKNOWN", "INFO", "FATAL", "DEBUG", "ERROR"]
|
|
Logger::Severity.constants.each do |level|
|
|
assert(levels.include?(level))
|
|
assert(logger_levels.include?(level))
|
|
end
|
|
assert_equal(levels.size, Logger::Severity.constants.size)
|
|
end
|
|
end
|
|
|
|
|
|
class TestLogger < Test::Unit::TestCase
|
|
include Logger::Severity
|
|
|
|
def setup
|
|
@logger = Logger.new(nil)
|
|
end
|
|
|
|
class Log
|
|
attr_reader :label, :datetime, :pid, :severity, :progname, :msg
|
|
def initialize(line)
|
|
/\A(\w+), \[([^#]*)#(\d+)\]\s+(\w+) -- (\w*): ([\x0-\xff]*)/ =~ line
|
|
@label, @datetime, @pid, @severity, @progname, @msg = $1, $2, $3, $4, $5, $6
|
|
end
|
|
end
|
|
|
|
def log_add(logger, severity, msg, progname = nil, &block)
|
|
do_log(logger, :add, severity, msg, progname, &block)
|
|
end
|
|
|
|
def do_log(logger, msg_id, *arg, &block)
|
|
logdev = Tempfile.new(File.basename(__FILE__) + '.log')
|
|
logger.instance_eval { @logdev = Logger::LogDevice.new(logdev) }
|
|
logger.__send__(msg_id, *arg, &block)
|
|
logdev.open
|
|
msg = logdev.read
|
|
logdev.close
|
|
Log.new(msg)
|
|
end
|
|
|
|
def test_level
|
|
@logger.level = UNKNOWN
|
|
assert_equal(UNKNOWN, @logger.level)
|
|
@logger.level = INFO
|
|
assert_equal(INFO, @logger.level)
|
|
@logger.sev_threshold = ERROR
|
|
assert_equal(ERROR, @logger.sev_threshold)
|
|
@logger.sev_threshold = WARN
|
|
assert_equal(WARN, @logger.sev_threshold)
|
|
assert_equal(WARN, @logger.level)
|
|
|
|
@logger.level = DEBUG
|
|
assert(@logger.debug?)
|
|
assert(@logger.info?)
|
|
@logger.level = INFO
|
|
assert(!@logger.debug?)
|
|
assert(@logger.info?)
|
|
assert(@logger.warn?)
|
|
@logger.level = WARN
|
|
assert(!@logger.info?)
|
|
assert(@logger.warn?)
|
|
assert(@logger.error?)
|
|
@logger.level = ERROR
|
|
assert(!@logger.warn?)
|
|
assert(@logger.error?)
|
|
assert(@logger.fatal?)
|
|
@logger.level = FATAL
|
|
assert(!@logger.error?)
|
|
assert(@logger.fatal?)
|
|
@logger.level = UNKNOWN
|
|
assert(!@logger.error?)
|
|
assert(!@logger.fatal?)
|
|
end
|
|
|
|
def test_progname
|
|
assert_nil(@logger.progname)
|
|
@logger.progname = "name"
|
|
assert_equal("name", @logger.progname)
|
|
end
|
|
|
|
def test_datetime_format
|
|
dummy = STDERR
|
|
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)
|
|
# [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_equal(Time.now.strftime("@%d%b%Y@"), log.datetime)
|
|
logger.datetime_format = ""
|
|
log = log_add(logger, INFO, "foo")
|
|
assert_match(/^$/, log.datetime)
|
|
end
|
|
|
|
def test_initialize
|
|
logger = Logger.new(STDERR)
|
|
assert_nil(logger.progname)
|
|
assert_equal(DEBUG, logger.level)
|
|
assert_nil(logger.datetime_format)
|
|
end
|
|
|
|
def test_add
|
|
logger = Logger.new(nil)
|
|
logger.progname = "my_progname"
|
|
assert(logger.add(INFO))
|
|
log = log_add(logger, nil, "msg")
|
|
assert_equal("ANY", log.severity)
|
|
assert_equal("my_progname", log.progname)
|
|
logger.level = WARN
|
|
assert(logger.log(INFO))
|
|
assert_nil(log_add(logger, INFO, "msg").msg)
|
|
log = log_add(logger, WARN, nil) { "msg" }
|
|
assert_equal("msg\n", log.msg)
|
|
log = log_add(logger, WARN, "") { "msg" }
|
|
assert_equal("\n", log.msg)
|
|
assert_equal("my_progname", log.progname)
|
|
log = log_add(logger, WARN, nil, "progname?")
|
|
assert_equal("progname?\n", log.msg)
|
|
assert_equal("my_progname", log.progname)
|
|
end
|
|
|
|
def test_level_log
|
|
logger = Logger.new(nil)
|
|
logger.progname = "my_progname"
|
|
log = do_log(logger, :debug, "custom_progname") { "msg" }
|
|
assert_equal("msg\n", log.msg)
|
|
assert_equal("custom_progname", log.progname)
|
|
assert_equal("DEBUG", log.severity)
|
|
assert_equal("D", log.label)
|
|
#
|
|
log = do_log(logger, :debug) { "msg_block" }
|
|
assert_equal("msg_block\n", log.msg)
|
|
assert_equal("my_progname", log.progname)
|
|
log = do_log(logger, :debug, "msg_inline")
|
|
assert_equal("msg_inline\n", log.msg)
|
|
assert_equal("my_progname", log.progname)
|
|
#
|
|
log = do_log(logger, :info, "custom_progname") { "msg" }
|
|
assert_equal("msg\n", log.msg)
|
|
assert_equal("custom_progname", log.progname)
|
|
assert_equal("INFO", log.severity)
|
|
assert_equal("I", log.label)
|
|
#
|
|
log = do_log(logger, :warn, "custom_progname") { "msg" }
|
|
assert_equal("msg\n", log.msg)
|
|
assert_equal("custom_progname", log.progname)
|
|
assert_equal("WARN", log.severity)
|
|
assert_equal("W", log.label)
|
|
#
|
|
log = do_log(logger, :error, "custom_progname") { "msg" }
|
|
assert_equal("msg\n", log.msg)
|
|
assert_equal("custom_progname", log.progname)
|
|
assert_equal("ERROR", log.severity)
|
|
assert_equal("E", log.label)
|
|
#
|
|
log = do_log(logger, :fatal, "custom_progname") { "msg" }
|
|
assert_equal("msg\n", log.msg)
|
|
assert_equal("custom_progname", log.progname)
|
|
assert_equal("FATAL", log.severity)
|
|
assert_equal("F", log.label)
|
|
#
|
|
log = do_log(logger, :unknown, "custom_progname") { "msg" }
|
|
assert_equal("msg\n", log.msg)
|
|
assert_equal("custom_progname", log.progname)
|
|
assert_equal("ANY", log.severity)
|
|
assert_equal("A", log.label)
|
|
end
|
|
|
|
def test_close
|
|
r, w = IO.pipe
|
|
assert(!w.closed?)
|
|
logger = Logger.new(w)
|
|
logger.close
|
|
assert(w.closed?)
|
|
r.close
|
|
end
|
|
|
|
class MyError < StandardError
|
|
end
|
|
|
|
class MyMsg
|
|
def inspect
|
|
"my_msg"
|
|
end
|
|
end
|
|
|
|
def test_format
|
|
logger = Logger.new(nil)
|
|
log = log_add(logger, INFO, "msg\n")
|
|
assert_equal("msg\n\n", log.msg)
|
|
begin
|
|
raise MyError.new("excn")
|
|
rescue MyError => e
|
|
log = log_add(logger, INFO, e)
|
|
assert_match(/^excn \(TestLogger::MyError\)/, log.msg)
|
|
# expects backtrace is dumped across multi lines. 10 might be changed.
|
|
assert(log.msg.split(/\n/).size >= 10)
|
|
end
|
|
log = log_add(logger, INFO, MyMsg.new)
|
|
assert_equal("my_msg\n", log.msg)
|
|
end
|
|
|
|
def test_lshift
|
|
r, w = IO.pipe
|
|
logger = Logger.new(w)
|
|
logger << "msg"
|
|
read_ready, = IO.select([r], nil, nil, 0.1)
|
|
w.close
|
|
msg = r.read
|
|
r.close
|
|
assert_equal("msg", msg)
|
|
#
|
|
r, w = IO.pipe
|
|
logger = Logger.new(w)
|
|
logger << "msg2\n\n"
|
|
read_ready, = IO.select([r], nil, nil, 0.1)
|
|
w.close
|
|
msg = r.read
|
|
r.close
|
|
assert_equal("msg2\n\n", msg)
|
|
end
|
|
end
|
|
|
|
class TestLogDevice < Test::Unit::TestCase
|
|
def d(log)
|
|
Logger::LogDevice.new(log)
|
|
end
|
|
|
|
def test_initialize
|
|
logdev = d(STDERR)
|
|
assert_equal(STDERR, logdev.dev)
|
|
assert_nil(logdev.filename)
|
|
assert_raises(TypeError) do
|
|
d(nil)
|
|
end
|
|
#
|
|
filename = __FILE__ + ".#{$$}"
|
|
begin
|
|
logdev = d(filename)
|
|
assert(File.exist?(filename))
|
|
assert(logdev.dev.sync)
|
|
assert_equal(filename, logdev.filename)
|
|
ensure
|
|
logdev.close
|
|
File.unlink(filename)
|
|
end
|
|
end
|
|
|
|
def test_write
|
|
r, w = IO.pipe
|
|
logdev = d(w)
|
|
logdev.write("msg2\n\n")
|
|
read_ready, = IO.select([r], nil, nil, 0.1)
|
|
w.close
|
|
msg = r.read
|
|
r.close
|
|
assert_equal("msg2\n\n", msg)
|
|
end
|
|
|
|
def test_close
|
|
r, w = IO.pipe
|
|
logdev = d(w)
|
|
logdev.write("msg2\n\n")
|
|
read_ready, = IO.select([r], nil, nil, 0.1)
|
|
assert(!w.closed?)
|
|
logdev.close
|
|
assert(w.closed?)
|
|
r.close
|
|
end
|
|
end
|