grntest 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59d77daf46cb62a91f7720b8d1564d5fdba3d52e711052f9fbd5766f08e68efe
-  data.tar.gz: 70994ec44ffd1616a10688c5a55bf8ad1c698762ca835188f48d1092bf02cfe4
+  metadata.gz: 0dde3b6cf798791dc6aeafd6b352238f07c7380203fee2e8972593fec9bfc6f7
+  data.tar.gz: 6b12f9e76f353417c5ad8c195db96a17029fd52ee8322c4d683215db17245758
 SHA512:
-  metadata.gz: 305c2e818362497ae196f322aab69e67a12577715ba23ba3ac2439ae71133047c474a215fac26c074f9b464cefa8cbe8fc54007d147fbbf122a1d8abc8dd3ee8
-  data.tar.gz: 24f24e86fe847c5787ab4e87de9f1bc2e3dc632342fad62e07691c931f6fed1abf64f033457af565edc1d5916df9617a4b8f75071544ec801899b9acf7a2cbf4
+  metadata.gz: 314b08a7d51b374159b9dc0e325b17c3c2b12e981e2508e7266132bb9e91c6ec4c2d7694d6d23435412595caf703a62a3980a7193842fc967f4f20a60c7650a1
+  data.tar.gz: 5d628089f0b428905fce39011c1acb827fca80932bcb139f632f891665a3bad0d3a74f7c1b403bab791c67c518f69e7c3065ee3f285dbab6d955cf02693f72f9

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.3.2: 2019-05-09
+
+### Improvements
+
+  * Changed to use groonga-log and groonga-query-log gems.
+
 ## 1.3.1: 2018-11-19
 
 ### Improvements

data/grntest.gemspec

@@ -1,6 +1,6 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- ruby -*-
 #
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  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
@@ -43,10 +43,12 @@ Gem::Specification.new do |spec|
     spec.executables = Dir.glob("*")
   end
 
-  spec.add_runtime_dependency("json")
-  spec.add_runtime_dependency("msgpack")
   spec.add_runtime_dependency("diff-lcs")
   spec.add_runtime_dependency("groonga-command-parser")
+  spec.add_runtime_dependency("groonga-log")
+  spec.add_runtime_dependency("groonga-query-log", ">= 1.4.1")
+  spec.add_runtime_dependency("json")
+  spec.add_runtime_dependency("msgpack")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  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
@@ -17,11 +17,11 @@ require "pathname"
 require "fileutils"
 require "shellwords"
 
+require "groonga-log"
+require "groonga-query-log"
 require "groonga/command/parser"
 
 require "grntest/error"
-require "grntest/log-parser"
-require "grntest/query-log-parser"
 require "grntest/execution-context"
 require "grntest/response-parser"
 require "grntest/template-evaluator"
@@ -277,7 +277,11 @@ module Grntest
       end
 
       def normalize_log_level(level)
-        level[0]
+        case level
+        when "info"
+          level = "information"
+        end
+        level.to_sym
       end
 
       def execute_directive_sleep(line, content, options)
@@ -424,10 +428,10 @@ module Grntest
 
       def extract_important_messages(log)
         important_messages = []
-        parser = LogParser.new
+        parser = GroongaLog::Parser.new
         in_crash = false
         parser.parse(log) do |entry|
-          if entry.log_level == "C"
+          if entry.log_level == :critical
             case entry.message
             when "-- CRASHED!!! --"
               in_crash = true
@@ -441,7 +445,8 @@ module Grntest
             next if !in_crash and backtrace_log_message?(entry.message)
           end
           next if thread_log_message?(entry.message)
-          important_messages << "\#|#{entry.log_level}| #{entry.message}"
+          formatted_log_level = format_log_level(entry.log_level)
+          important_messages << "\#|#{formatted_log_level}| #{entry.message}"
         end
         important_messages.join("\n")
       end
@@ -462,8 +467,37 @@ module Grntest
       end
 
       def important_log_level?(log_level)
-        ["E", "A", "C", "e", "w"].include?(log_level) or
-          @custom_important_log_levels.include?(log_level)
+        case log_level
+        when :emergency, :alert, :critical, :error, :warning
+          true
+        when *@custom_important_log_levels
+          true
+        else
+          false
+        end
+      end
+
+      def format_log_level(log_level)
+        case log_level
+        when :emergency
+          "E"
+        when :alert
+          "A"
+        when :critical
+          "C"
+        when :error
+          "e"
+        when :warning
+          "w"
+        when :notice
+          "n"
+        when :information
+          "i"
+        when :debug
+          "d"
+        when :dump
+          "-"
+        end
       end
 
       def backtrace_log_message?(message)
@@ -539,9 +573,22 @@ module Grntest
       def log_query_log_content(content)
         return unless @context.collect_query_log?
 
-        parser = QueryLogParser.new
-        parser.parse(content) do |entry|
-          log_query("\##{entry.mark}#{entry.message}")
+        parser = GroongaQueryLog::Parser.new
+        parser.parse(content) do |statistic|
+          relative_elapsed_time = "000000000000000"
+          command = statistic.command
+          if command
+            command[:output_type] = nil if command.output_type == :json
+            log_query("\#>#{command.to_command_format}")
+          end
+          statistic.each_operation do |operation|
+            message = operation[:raw_message]
+            if operation[:name] == "cache"
+              message = message.gsub(/\(\d+\)/, "(0)")
+            end
+            log_query("\#:#{relative_elapsed_time} #{message}")
+          end
+          log_query("\#<#{relative_elapsed_time} rc=#{statistic.return_code}")
         end
       end
 

data/lib/grntest/test-runner.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2019  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
@@ -19,11 +19,11 @@ require "tempfile"
 require "timeout"
 require "socket"
 
+require "groonga-log"
 require "json"
 
 require "grntest/platform"
 require "grntest/error"
-require "grntest/log-parser"
 require "grntest/executors"
 require "grntest/base-result"
 
@@ -379,11 +379,13 @@ call chdir("#{context.temporary_directory_path}")
           end
           yield(executor)
         ensure
-          if executor.shutdown(pid)
-            pid = nil
-          else
-            wait_groonga_http_shutdown(pid_file_path)
-            pid = nil if wait_pid(pid)
+          if pid
+            if executor.shutdown(pid)
+              pid = nil
+            else
+              wait_groonga_http_shutdown(pid_file_path)
+              pid = nil if wait_pid(pid)
+            end
           end
         end
       ensure
@@ -806,7 +808,7 @@ http {
     end
 
     def check_memory_leak(context)
-      parser = LogParser.new
+      parser = GroongaLog::Parser.new
       parser.parse(context.log) do |entry|
         next unless /^grn_fin \((\d+)\)$/ =~ entry.message
         n_leaked_objects = $1.to_i

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.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: msgpack
+  name: groonga-command-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: diff-lcs
+  name: groonga-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +54,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: groonga-command-parser
+  name: groonga-query-log
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -176,11 +204,7 @@ 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/platform.rb
-- lib/grntest/query-log-entry.rb
-- lib/grntest/query-log-parser.rb
 - lib/grntest/reporters.rb
 - lib/grntest/reporters/base-reporter.rb
 - lib/grntest/reporters/buffered-mark-reporter.rb
@@ -219,13 +243,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 3.0.0.beta2
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Grntest is a testing framework for Groonga. You can write a test for Groonga
   by writing Groonga commands and expected result.
 test_files:
+- test/test-log-parser.rb
 - test/run-test.rb
 - test/executors/test-base-executor.rb
 - test/executors/test-standard-io-executor.rb
-- test/test-log-parser.rb

data/lib/grntest/log-entry.rb

@@ -1,19 +0,0 @@
-# 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

@@ -1,48 +0,0 @@
-# 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])\|
-                (?:\d+:)?
-                \s*/x
-          emit_entry.call
-          timestamp = $1
-          log_level = $2
-          message = $POSTMATCH
-        else
-          message ||= ""
-          message << line
-        end
-      end
-      emit_entry.call
-    end
-  end
-end

data/lib/grntest/query-log-entry.rb

@@ -1,19 +0,0 @@
-# Copyright (C) 2015  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 QueryLogEntry < Struct.new(:timestamp, :mark, :message)
-  end
-end

data/lib/grntest/query-log-parser.rb

@@ -1,71 +0,0 @@
-# Copyright (C) 2015-2017  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/query-log-entry"
-
-module Grntest
-  class QueryLogParser
-    def parse(log)
-      log.each_line do |line|
-        case line
-        when /\A(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+)\|.+?\|(.)/
-          timestamp = $1
-          mark = $2
-          message = normalize_message(mark, $POSTMATCH.chomp)
-          entry = QueryLogEntry.new(timestamp, mark, message)
-          yield(entry)
-        end
-      end
-    end
-
-    private
-    def normalize_message(mark, message)
-      case mark
-      when ">"
-        message = normalize_command(message)
-      else
-        message = normalize_elapsed_time(message)
-        message = normalize_cache_content(message)
-      end
-      message
-    end
-
-    def normalize_command(message)
-      command = nil
-      Groonga::Command::Parser.parse(message) do |status, *args|
-        case status
-        when :on_command
-          command = args[0]
-        when :on_load_start
-          command = args[0]
-        end
-      end
-      if command.output_type == :json
-        command[:output_type] = nil
-      end
-      command.to_command_format
-    end
-
-    def normalize_elapsed_time(message)
-      message.gsub(/\A\d{15} /, "0" * 15 + " ")
-    end
-
-    def normalize_cache_content(message)
-      message.gsub(/\A(0{15}) (cache\()\d+(\))\z/) do
-        "#{$1} #{$2}0#{$3}"
-      end
-    end
-  end
-end