grntest 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7da2ff4d46c711c2bc7bf534ed0478fc4bb9a510
-  data.tar.gz: 7734142d71d8b3d0375e9275eb168fac6df23932
+  metadata.gz: c677198eaacb9883f7cd6ca46f7b7cf0ee6d5aea
+  data.tar.gz: 8b50e54a05791eaf15370b1951eac4b831a52e31
 SHA512:
-  metadata.gz: d17ae23c5d7342c7aae95d96bf2c8e271661860232b4766d7397250c1276b7984d1be6b2d415f30639b5a1f2a0b4be8705c6202973bd626afdc4b38bdce63994
-  data.tar.gz: e35c94ee423590de22f75f33406f6728ce6ff016d08001aac49645dd1b8d7f74c7d68d0ac14e0396209a20e4efc27284c62910b0a0516602668d0f4ee9602050
+  metadata.gz: d8d191e4fd6029fedfa9a4b346514f280ad133266e8acb236a0c0f46ee9b35a6e8cff38e7b84c3f8d13c894ab82c20a610ed4d9c7ab1d62d2fe18552c50efa69
+  data.tar.gz: 0421f9e8c25fce0adbcaa43c6503737c71c8bcd2c49f167ef57c3333eabc00a7172314599c2dcb945cf0deaf56ba80e6fa8c2fc11db02253f22cf8e1991c560a

data/README.md

@@ -219,6 +219,8 @@ Here are available `NAME` s:
 * `omit`
 * `add-important-log-levels`
 * `remove-important-log-levels`
+* `sleep`
+* `collect-query-log`
 
 `ARGUMENTS...` are depends on directive. A directive doesn't require
 any arguments but a directive requires arguments.
@@ -357,6 +359,9 @@ Usage:
 It copies a path from `SOURCE` to `DESTINATION`. You can use it for
 both file and directory. It is useful for using fixture data.
 
+You can use `#{db_path}` in `SOURCE` and `DESTINATION`. `#{db_path}`
+is expanded to the path of the database.
+
 Example:
 
 ```
@@ -510,6 +515,46 @@ log_put --level debug --message "This is a message"
 # No message is collected by grntest
 ```
 
+#### `sleep`
+
+Usage:
+
+```
+#@sleep SECOND
+```
+
+It stops execution while the specified seconds.
+
+Example:
+
+```
+load --table Users
+[
+{"_key": "User1"}
+]
+#@sleep 1.5
+# Run select after 1.5 sec.
+select Users --query _key:User1
+```
+
+#### `collect-query-log`
+
+Usage:
+
+```
+#@collect-query-log [true|false]
+```
+
+It collects messages from query log and prints them.
+
+Example:
+
+```
+#@collect-query-log true
+select Users --query _key:User1
+#@collect-query-log false
+```
+
 ## Options
 
 Grntest has many options. You don't need to specify many of them

data/doc/text/news.md

@@ -1,5 +1,20 @@
 # News
 
+## 1.1.3: 2016-03-20
+
+### Improvements
+
+  * Added `sleep` directive.
+  * Added `collect-query-log` directive.
+  * Added `buffered-mark` reporter. You can use it by
+    `--runner=buffered-mark`.
+  * Improved OS X support.
+  * Supported `#{db_path}` in `copy-path` directive argument.
+  * Supported SEGV detection on exit.
+  * Supported `--columns` option of `load` command.
+  * Suppressed omit logs by default. You can enable it by
+    `--no-suppress-omit-log`.
+
 ## 1.1.2: 2015-07-08
 
 ### Improvements

data/lib/grntest/execution-context.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-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
@@ -24,6 +24,7 @@ module Grntest
     attr_accessor :output_type
     attr_accessor :on_error
     attr_accessor :abort_tag
+    attr_writer :collect_query_log
     def initialize
       @logging = true
       @base_directory = Pathname(".")
@@ -37,12 +38,17 @@ module Grntest
       @on_error = :default
       @abort_tag = nil
       @omitted = false
+      @collect_query_log = false
     end
 
     def logging?
       @logging
     end
 
+    def collect_query_log?
+      @collect_query_log
+    end
+
     def execute
       @n_nested += 1
       yield
@@ -62,6 +68,14 @@ module Grntest
       @log ||= File.open(log_path.to_s, "a+")
     end
 
+    def query_log_path
+      @temporary_directory_path + "groonga.query.log"
+    end
+
+    def query_log
+      @query_log ||= File.open(query_log_path.to_s, "a+")
+    end
+
     def relative_db_path
       @db_path.relative_path_from(@temporary_directory_path)
     end

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

@@ -21,6 +21,7 @@ require "groonga/command/parser"
 
 require "grntest/error"
 require "grntest/log-parser"
+require "grntest/query-log-parser"
 require "grntest/execution-context"
 require "grntest/response-parser"
 
@@ -71,7 +72,34 @@ module Grntest
         @context.result
       end
 
+      def shutdown(pid)
+        begin
+          send_command(command("shutdown"))
+        rescue
+          return false
+        end
+
+        status = nil
+        timeout = 1
+        total_sleep_time = 0
+        sleep_time = 0.05
+        loop do
+          _, status = Process.waitpid2(pid, Process::WNOHANG)
+          break if status
+          sleep(sleep_time)
+          total_sleep_time += sleep_time
+          return false if total_sleep_time > timeout
+        end
+
+        log_error(read_all_log) unless status.success?
+        true
+      end
+
       private
+      def command(command_line)
+        Groonga::Command::Parser.parse(command_line)
+      end
+
       def create_parser
         parser = Groonga::Command::Parser.new
         parser.on_command do |command|
@@ -127,6 +155,17 @@ module Grntest
         execute_script(Pathname(path))
       end
 
+      def expand_variables(string)
+        string.gsub(/\#{(.+?)}/) do |matched|
+          case $1
+          when "db_path"
+            @context.db_path.to_s
+          else
+            matched
+          end
+        end
+      end
+
       def execute_directive_copy_path(line, content, options)
         source, destination, = options
         if source.nil? or destination.nil?
@@ -139,8 +178,8 @@ module Grntest
           end
           return
         end
-        source = resolve_path(Pathname(source))
-        destination = resolve_path(Pathname(destination))
+        source = resolve_path(Pathname(expand_variables(source)))
+        destination = resolve_path(Pathname(expand_variables(destination)))
         FileUtils.cp_r(source.to_s, destination.to_s)
       end
 
@@ -210,6 +249,15 @@ module Grntest
         level[0]
       end
 
+      def execute_directive_sleep(line, content, options)
+        time = options[0].to_f
+        sleep(time) if time >= 0
+      end
+
+      def execute_directive_collect_query_log(line, content, options)
+        @context.collect_query_log = (options[0] == "true")
+      end
+
       def execute_directive(line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -233,6 +281,10 @@ module Grntest
           execute_directive_add_important_log_levels(line, content, options)
         when "remove-important-log-levels"
           execute_directive_remove_important_log_levels(line, content, options)
+        when "sleep"
+          execute_directive_sleep(line, content, options)
+        when "collect-query-log"
+          execute_directive_collect_query_log(line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -284,6 +336,7 @@ module Grntest
           type = @output_type
           log_output(response)
           log_error(extract_important_messages(read_all_log))
+          log_query_log_content(read_all_query_log)
 
           @context.error if error_response?(response, type)
         end
@@ -293,6 +346,10 @@ module Grntest
         read_all_readable_content(context.log, :first_timeout => 0)
       end
 
+      def read_all_query_log
+        read_all_readable_content(context.query_log, :first_timeout => 0)
+      end
+
       def extract_important_messages(log)
         important_messages = []
         parser = LogParser.new
@@ -306,7 +363,7 @@ module Grntest
 
       def read_all_readable_content(output, options={})
         content = ""
-        first_timeout = options[:first_timeout] || 1
+        first_timeout = options[:first_timeout] || 5
         timeout = first_timeout
         while IO.select([output], [], [], timeout)
           break if output.eof?
@@ -329,6 +386,10 @@ module Grntest
           true
         when /\Agroonga\(\) \[0x[\da-f]+\]\z/
           true
+        when /\A\d+\s+(?:lib\S+\.dylib|\S+\.so|groonga|nginx|\?\?\?)\s+
+                0x[\da-f]+\s
+                \S+\s\+\s\d+\z/x
+          true
         else
           false
         end
@@ -372,6 +433,19 @@ module Grntest
         log_force(:error, content, {})
       end
 
+      def log_query(content)
+        log_force(:query, content, {})
+      end
+
+      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}")
+        end
+      end
+
       def default_long_timeout
         180
       end

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

@@ -49,22 +49,11 @@ module Grntest
         end
       end
 
-      def shutdown
-        begin
-          send_command(command("shutdown"))
-        rescue Error
-        end
-      end
-
       def create_sub_executor(context)
         self.class.new(@host, @port, context)
       end
 
       private
-      def command(command_line)
-        Groonga::Command::Parser.parse(command_line)
-      end
-
       MAX_URI_SIZE = 4096
       def send_load_command(command)
         lines = command.original_source.lines
@@ -74,7 +63,9 @@ module Grntest
 
         values = command.arguments.delete(:values)
         if lines.size >= 2 and lines[1].start_with?("[")
-          command.arguments.delete(:columns)
+          unless /\s--columns\s/ =~ lines.first
+            command.arguments.delete(:columns)
+          end
           body = lines[1..-1].join
         else
           body = values

data/lib/grntest/executors/standard-io-executor.rb

@@ -27,8 +27,8 @@ module Grntest
       end
 
       def send_command(command)
-        command_line = @current_command.original_source
-        unless @current_command.has_key?(:output_type)
+        command_line = command.original_source
+        if !command.key?(:output_type) and @output_type
           command_line = command_line.sub(/$/, " --output_type #{@output_type}")
         end
         begin
@@ -39,7 +39,7 @@ module Grntest
           message = "failed to write to groonga: <#{command_line}>: #{$!}"
           raise Error.new(message)
         end
-        read_output
+        read_output(command)
       end
 
       def ensure_groonga_ready
@@ -53,19 +53,24 @@ module Grntest
       end
 
       private
-      def read_output
+      def read_output(command)
         options = {}
-        options[:first_timeout] = @long_timeout if may_slow_command?
+        if may_slow_command?(command)
+          options[:first_timeout] = @long_timeout
+        elsif command.name == "dump"
+          options[:first_timeout] = 0.1
+        end
         read_all_readable_content(@output, options)
       end
 
       MAY_SLOW_COMMANDS = [
         "column_create",
-        "register",
         "load",
+        "plugin_register",
+        "register",
       ]
-      def may_slow_command?
-        MAY_SLOW_COMMANDS.include?(@current_command.name)
+      def may_slow_command?(command)
+        MAY_SLOW_COMMANDS.include?(command.name)
       end
     end
   end

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

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

@@ -0,0 +1,63 @@
+# 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/>.
+
+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 = Groonga::Command::Parser.parse(message)
+      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

data/lib/grntest/reporters.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-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
@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require "grntest/reporters/mark-reporter"
+require "grntest/reporters/buffered-mark-reporter"
 require "grntest/reporters/stream-reporter"
 require "grntest/reporters/inplace-reporter"
 
@@ -26,6 +27,8 @@ module Grntest
         case tester.reporter
         when :mark
           MarkReporter.new(tester)
+        when :"buffered-mark"
+          BufferedMarkReporter.new(tester)
         when :stream
           StreamReporter.new(tester)
         when :inplace

data/lib/grntest/reporters/base-reporter.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-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
@@ -155,7 +153,7 @@ module Grntest
       end
 
       def print(message)
-        @current_column += string_width(message.to_s)
+        increment_current_column(message)
         @output.print(message)
       end
 
@@ -164,6 +162,10 @@ module Grntest
         @output.puts(*messages)
       end
 
+      def increment_current_column(message)
+        @current_column += string_width(message.to_s)
+      end
+
       def reset_current_column
         @current_column = 0
       end

data/lib/grntest/reporters/buffered-mark-reporter.rb

@@ -0,0 +1,41 @@
+# 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/>.
+
+require "grntest/reporters/mark-reporter"
+
+module Grntest
+  module Reporters
+    class BufferedMarkReporter < MarkReporter
+      def initialize(tester)
+        super
+        @buffer = ""
+      end
+
+      private
+      def print_new_line
+        puts(@buffer)
+        @buffer.clear
+      end
+
+      def print_mark(mark)
+        increment_current_column(mark)
+        @buffer << mark
+      end
+
+      def flush_mark
+      end
+    end
+  end
+end

data/lib/grntest/reporters/mark-reporter.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-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
@@ -45,7 +45,7 @@ module Grntest
       def on_test_failure(worker, result)
         synchronize do
           report_test_result_mark("F", result)
-          puts
+          print_new_line
           report_test(worker, result)
           report_failure(result)
         end
@@ -54,7 +54,7 @@ module Grntest
       def on_test_leak(worker, result)
         synchronize do
           report_test_result_mark("L(#{result.n_leaked_objects})", result)
-          puts
+          print_new_line
           report_test(worker, result)
           if result.checked?
             report_actual(result)
@@ -67,7 +67,7 @@ module Grntest
       def on_test_omission(worker, result)
         synchronize do
           report_test_result_mark("O", result)
-          puts
+          print_new_line
           report_test(worker, result)
           report_actual(result)
         end
@@ -76,7 +76,7 @@ module Grntest
       def on_test_no_check(worker, result)
         synchronize do
           report_test_result_mark("N", result)
-          puts
+          print_new_line
           report_test(worker, result)
           report_actual(result)
         end
@@ -92,23 +92,35 @@ module Grntest
       end
 
       def on_finish(result)
-        puts
-        puts
+        print_new_line
+        print_new_line
         report_summary(result)
       end
 
       private
       def report_test_result_mark(mark, result)
         if @term_width < @current_column + mark.bytesize
-          puts
+          print_new_line
         end
-        print(colorize(mark, result))
+        print_mark(colorize(mark, result))
         if @term_width <= @current_column
-          puts
+          print_new_line
         else
-          @output.flush
+          flush_mark
         end
       end
+
+      def print_new_line
+        puts
+      end
+
+      def print_mark(mark)
+        print(mark)
+      end
+
+      def flush_mark
+        @output.flush
+      end
     end
   end
 end

data/lib/grntest/test-runner.rb

@@ -204,7 +204,11 @@ module Grntest
                                                        groonga_output,
                                                        context)
           executor.ensure_groonga_ready
-          yield(executor)
+          begin
+            yield(executor)
+          ensure
+            pid = nil if executor.shutdown(pid)
+          end
         end
       ensure
         Process.waitpid(pid) if pid
@@ -284,6 +288,7 @@ call chdir("#{context.temporary_directory_path}")
       command_line = command_command_line(@tester.groonga, context,
                                           spawn_options)
       command_line << "--log-path=#{context.log_path}"
+      command_line << "--query-log-path=#{context.query_log_path}"
       command_line << "--working-directory=#{context.temporary_directory_path}"
       command_line
     end
@@ -338,7 +343,7 @@ call chdir("#{context.temporary_directory_path}")
           end
           yield(executor)
         ensure
-          executor.shutdown
+          pid = nil if executor.shutdown(pid)
           if wait_groonga_http_shutdown(pid_file_path, shutdown_wait_timeout)
             pid = nil if wait_pid(pid, shutdown_wait_timeout)
           end
@@ -450,6 +455,7 @@ http {
              location /d/ {
                      groonga_database #{context.relative_db_path};
                      groonga_log_path #{context.log_path};
+                     groonga_query_log_path #{context.query_log_path};
                      groonga on;
             }
      }
@@ -487,6 +493,8 @@ http {
           normalized_result << normalize_output(content, options)
         when :error
           normalized_result << normalize_error(content)
+        when :query
+          normalized_result << normalize_raw_content(content)
         when :n_leaked_objects
           result.n_leaked_objects = content
         end
@@ -534,6 +542,8 @@ http {
       when "xml"
         normalized_xml = normalize_output_xml(content, options)
         normalize_raw_content(normalized_xml)
+      when "groonga-command"
+        normalize_raw_content(content.chomp)
       else
         normalize_raw_content(content)
       end
@@ -578,14 +588,10 @@ http {
 
     def normalize_path_in_error_message(content)
       case content
-      when /\A(.*'fopen: failed to open mruby script file: )<(.+?)>'(.*)\z/
+      when /\A(.*: fopen: failed to open mruby script file: )<(.+?)>?\z/
         pre = $1
         path = $2
-        post = $3
-        normalized_path = File.basename(path)
-        post = post.gsub(/\[\d+\]\z/, "[?]")
-        post = "" unless /[\)\]]\z/ =~ post
-        "#{pre}<#{normalized_path}>'#{post}"
+        "#{pre}<PATH>"
       else
         content
       end

data/lib/grntest/tester.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2016  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
@@ -116,7 +114,7 @@ module Grntest
           diff_option_is_specified = true
         end
 
-        available_reporters = [:mark, :stream, :inplace]
+        available_reporters = [:mark, :"buffered-mark", :stream, :inplace]
         available_reporter_labels = available_reporters.join(", ")
         parser.on("--reporter=REPORTER", available_reporters,
                   "Report test result by REPORTER",
@@ -188,6 +186,12 @@ module Grntest
           tester.stop_on_failure = boolean
         end
 
+        parser.on("--no-suppress-omit-log",
+                  "Suppress omit logs",
+                  "(#{tester.suppress_omit_log?})") do |boolean|
+          tester.suppress_omit_log = boolean
+        end
+
         parser.on("--output=OUTPUT",
                   "Output to OUTPUT",
                   "(stdout)") do |output|
@@ -228,6 +232,7 @@ module Grntest
     attr_writer :valgrind_gen_suppressions
     attr_writer :reporter, :keep_database, :use_color
     attr_writer :stop_on_failure
+    attr_writer :suppress_omit_log
     attr_reader :test_patterns, :test_suite_patterns
     attr_reader :exclude_test_patterns, :exclude_test_suite_patterns
     def initialize
@@ -245,6 +250,7 @@ module Grntest
       @keep_database = false
       @use_color = nil
       @stop_on_failure = false
+      @suppress_omit_log = true
       @test_patterns = []
       @test_suite_patterns = []
       @exclude_test_patterns = []
@@ -289,6 +295,10 @@ module Grntest
       @stop_on_failure
     end
 
+    def suppress_omit_log?
+      @suppress_omit_log
+    end
+
     def valgrind_gen_suppressions?
       @valgrind_gen_suppressions
     end

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.1.2"
+  VERSION = "1.1.3"
 end

data/lib/grntest/worker.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2016  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
@@ -148,7 +146,9 @@ module Grntest
     def on_test_omission(result)
       @status = "omitted"
       @result.on_test_omission
-      @reporter.on_test_omission(self, result)
+      unless @tester.suppress_omit_log?
+        @reporter.on_test_omission(self, result)
+      end
     end
 
     def on_test_no_check(result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -163,8 +163,11 @@ files:
 - lib/grntest/executors/standard-io-executor.rb
 - lib/grntest/log-entry.rb
 - lib/grntest/log-parser.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
 - lib/grntest/reporters/inplace-reporter.rb
 - lib/grntest/reporters/mark-reporter.rb
 - lib/grntest/reporters/stream-reporter.rb
@@ -198,14 +201,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 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/run-test.rb
+- test/test-log-parser.rb
 has_rdoc: