grntest 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e3f89c9bfca8e9409f3ea9901545cdf88d8df0c
-  data.tar.gz: 7454542a28073b636438762f294b446a553d679f
+  metadata.gz: 2eaa3b200f88ffe43771ed58704ddc925c8c3b54
+  data.tar.gz: d55bdd76d826f869ecb6482b2c04d2a5b6ed7beb
 SHA512:
-  metadata.gz: f6cb769472bcaf8c2309de3ffb290f26ee16296ad7ce9a5847719f042fad1e11239ea8c8d5fb131e523f631e88a637493678db3a61b6a2197a81b724970a6c70
-  data.tar.gz: 5f6ca62f6a91a41df7856a79155c54d947874e1d65e3c5be8d8f66a972adae9543f0b1dd30fc7045f9f86b596b439bab7c89420d69114f3784571479cb5080d9
+  metadata.gz: 2aa26866b78d9e4c0a89ba28d1041dec5e698025f89533ef2c460114bd0d2331d2f80806ff19c5486effc6e4172e382c6fbfe45887102adcd29902f9e261f21d
+  data.tar.gz: 1bc57cd0f43d21abaedda718f65cf4bfc486c8ad93c97c812a1691500a78b2f922870f21ba1d99c4b0a9287e94674af4583f09f2dbd1ea171e3a3c2b5ef25607

data/doc/text/news.md

@@ -1,5 +1,16 @@
 # News
 
+## 1.0.9: 2014-09-28
+
+### Improvements
+
+  * Support multi-line log.
+    [GitHub#2] [Reported by Naoya Murakami]
+
+### Thanks
+
+  * Naoya Murakami
+
 ## 1.0.8: 2014-08-17
 
 ### Fixes

data/grntest.gemspec

@@ -49,7 +49,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")
-  spec.add_development_dependency("test-unit")
+  spec.add_development_dependency("test-unit", ">= 3.0.0")
   spec.add_development_dependency("test-unit-rr")
   spec.add_development_dependency("packnga")
   spec.add_development_dependency("redcarpet")

data/lib/grntest/executors/base-executor.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,6 +20,7 @@ require "shellwords"
 require "groonga/command/parser"
 
 require "grntest/error"
+require "grntest/log-parser"
 require "grntest/execution-context"
 require "grntest/response-parser"
 
@@ -273,13 +272,11 @@ module Grntest
 
       def extract_important_messages(log)
         important_messages = []
-        log.each_line do |line|
-          timestamp, log_level, message = line.split(/\|\s*/, 3)
-          _ = timestamp # suppress warning
-          message = message.chomp
-          next unless important_log_level?(log_level)
-          next if backtrace_log_message?(message)
-          important_messages << "\#|#{log_level}| #{message}"
+        parser = LogParser.new
+        parser.parse(log) do |entry|
+          next unless important_log_level?(entry.log_level)
+          next if backtrace_log_message?(entry.message)
+          important_messages << "\#|#{entry.log_level}| #{entry.message}"
         end
         important_messages.join("\n")
       end

data/lib/grntest/log-entry.rb

@@ -0,0 +1,19 @@
+# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Grntest
+  class LogEntry < Struct.new(:timestamp, :log_level, :message)
+  end
+end

data/lib/grntest/log-parser.rb

@@ -0,0 +1,44 @@
+# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "grntest/log-entry"
+
+module Grntest
+  class LogParser
+    def parse(log)
+      timestamp = nil
+      log_level = nil
+      message = nil
+      emit_entry = lambda do
+        if timestamp
+          entry = LogEntry.new(timestamp, log_level, message.chomp)
+          yield(entry)
+        end
+      end
+      log.each_line do |line|
+        case line
+        when /\A(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+)\|([a-zA-Z])\|\s*/
+          emit_entry.call
+          timestamp = $1
+          log_level = $2
+          message = $POSTMATCH
+        else
+          message << line
+        end
+      end
+      emit_entry.call
+    end
+  end
+end

data/lib/grntest/test-runner.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,6 +20,7 @@ require "tempfile"
 require "json"
 
 require "grntest/error"
+require "grntest/log-parser"
 require "grntest/executors"
 require "grntest/base-result"
 
@@ -549,10 +548,9 @@ EOF
     end
 
     def check_memory_leak(context)
-      context.log.each_line do |line|
-        timestamp, log_level, message = line.split(/\|\s*/, 3)
-        _ = timestamp # suppress warning
-        next unless /^grn_fin \((\d+)\)$/ =~ message
+      parser = LogParser.new
+      parser.parse(context.log) do |entry|
+        next unless /^grn_fin \((\d+)\)$/ =~ entry.message
         n_leaked_objects = $1.to_i
         next if n_leaked_objects.zero?
         context.result << [:n_leaked_objects, n_leaked_objects, {}]

data/lib/grntest/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/test/executors/test-base-executor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2014  Kouhei Sutou <kou@clear-code.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,14 +21,16 @@ class TestBaseExecutor < Test::Unit::TestCase
     @context = @executor.context
   end
 
-  class TestErrorLog < self
+  class TestErrorLogLevel < self
     data("emergency" => "E",
          "alert"     => "A",
          "critical"  => "C",
          "error"     => "e",
          "warning"   => "w")
     def test_important_log_level(level)
-      assert_true(@executor.send(:important_log_level?, level))
+      assert do
+        @executor.send(:important_log_level?, level)
+      end
     end
 
     data("notice"  => "n",
@@ -36,7 +38,9 @@ class TestBaseExecutor < Test::Unit::TestCase
          "debug"   => "d",
          "dump"    => "-")
     def test_not_important_log_level(level)
-      assert_false(@executor.send(:important_log_level?, level))
+      assert do
+        not @executor.send(:important_log_level?, level)
+      end
     end
   end
 end

data/test/test-log-parser.rb

@@ -0,0 +1,77 @@
+# Copyright (C) 2014  Kouhei Sutou <kou@clear-code.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "grntest/log-parser"
+
+class TestLogParser < Test::Unit::TestCase
+  def parse(log)
+    parser = Grntest::LogParser.new
+    entries = []
+    parser.parse(log) do |entry|
+      entries << entry.to_h
+    end
+    entries
+  end
+
+  sub_test_case("#parse") do
+    def test_one_line
+      log = "2014-09-27 17:31:53.046467|n| message"
+      assert_equal([
+                     {
+                       :timestamp => "2014-09-27 17:31:53.046467",
+                       :log_level => "n",
+                       :message   => "message",
+                     },
+                   ],
+                   parse(log))
+    end
+
+    def test_one_lines
+      log = <<-LOG
+2014-09-27 17:31:53.046467|n| notification message
+2014-09-27 17:31:54.046467|W| warning message
+      LOG
+      assert_equal([
+                     {
+                       :timestamp => "2014-09-27 17:31:53.046467",
+                       :log_level => "n",
+                       :message   => "notification message",
+                     },
+                     {
+                       :timestamp => "2014-09-27 17:31:54.046467",
+                       :log_level => "W",
+                       :message   => "warning message",
+                     },
+                   ],
+                   parse(log))
+    end
+
+
+    def test_multi_line
+      log = <<-LOG
+2014-09-27 17:31:53.046467|n| multi
+line message
+      LOG
+      assert_equal([
+                     {
+                       :timestamp => "2014-09-27 17:31:53.046467",
+                       :log_level => "n",
+                       :message   => "multi\nline message",
+                     },
+                   ],
+                   parse(log))
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,8 @@ files:
 - lib/grntest/executors/base-executor.rb
 - lib/grntest/executors/http-executor.rb
 - lib/grntest/executors/standard-io-executor.rb
+- lib/grntest/log-entry.rb
+- lib/grntest/log-parser.rb
 - lib/grntest/reporters.rb
 - lib/grntest/reporters/base-reporter.rb
 - lib/grntest/reporters/inplace-reporter.rb
@@ -175,6 +177,7 @@ files:
 - test/executors/test-base-executor.rb
 - test/executors/test-standard-io-executor.rb
 - test/run-test.rb
+- test/test-log-parser.rb
 homepage: https://github.com/groonga/grntest
 licenses:
 - GPL-3.0+
@@ -204,4 +207,5 @@ test_files:
 - test/executors/test-base-executor.rb
 - test/executors/test-standard-io-executor.rb
 - test/run-test.rb
+- test/test-log-parser.rb
 has_rdoc: