Kouhei Sutou
null+****@clear*****
Mon Aug 12 12:55:00 JST 2013
Kouhei Sutou 2013-08-12 12:55:00 +0900 (Mon, 12 Aug 2013) New Revision: d3723a372b36bd540c4e3daa46ffe4346873f18d https://github.com/groonga/grntest/commit/d3723a372b36bd540c4e3daa46ffe4346873f18d Message: Make warning log messages testable Modified files: lib/grntest/executors/base-executor.rb test/executors/test-base-executor.rb Modified: lib/grntest/executors/base-executor.rb (+12 -9) =================================================================== --- lib/grntest/executors/base-executor.rb 2013-08-12 12:49:24 +0900 (29bd7be) +++ lib/grntest/executors/base-executor.rb 2013-08-12 12:55:00 +0900 (833a5af) @@ -243,22 +243,25 @@ module Grntest response = send_command(command) type = @output_type log_output(response) - log_error(read_error_log) + log_error(extract_important_messages(read_all_log)) @context.error if error_response?(response, type) end - def read_error_log - log = read_all_readable_content(context.log, :first_timeout => 0) - normalized_error_log = "" + def read_all_log + read_all_readable_content(context.log, :first_timeout => 0) + end + + def extract_important_messages(log) + important_messages = "" log.each_line do |line| timestamp, log_level, message = line.split(/\|\s*/, 3) _ = timestamp # suppress warning - next unless error_log_level?(log_level) + next unless important_log_level?(log_level) next if backtrace_log_message?(message) - normalized_error_log << "\#|#{log_level}| #{message}" + important_messages << "\#|#{log_level}| #{message}" end - normalized_error_log.chomp + important_messages.chomp end def read_all_readable_content(output, options={}) @@ -275,8 +278,8 @@ module Grntest content end - def error_log_level?(log_level) - ["E", "A", "C", "e"].include?(log_level) + def important_log_level?(log_level) + ["E", "A", "C", "e", "w"].include?(log_level) end def backtrace_log_message?(message) Modified: test/executors/test-base-executor.rb (+7 -7) =================================================================== --- test/executors/test-base-executor.rb 2013-08-12 12:49:24 +0900 (a1b7dc2) +++ test/executors/test-base-executor.rb 2013-08-12 12:55:00 +0900 (3f84635) @@ -25,18 +25,18 @@ class TestBaseExecutor < Test::Unit::TestCase data("emergency" => "E", "alert" => "A", "critical" => "C", - "error" => "e") - def test_error_log_level(level) - assert_true(@executor.send(:error_log_level?, level)) + "error" => "e", + "warning" => "w") + def test_important_log_level(level) + assert_true(@executor.send(:important_log_level?, level)) end - data("warning" => "w", - "notice" => "n", + data("notice" => "n", "info" => "i", "debug" => "d", "dump" => "-") - def test_not_error_log_level(level) - assert_false(@executor.send(:error_log_level?, level)) + def test_not_important_log_level(level) + assert_false(@executor.send(:important_log_level?, level)) end end end -------------- next part -------------- HTML����������������������������...Download