grntest 1.3.7 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba7e05aef3a6c662712ec931374dfb8889222eddc6716bc0c9efa0cf99cd882
-  data.tar.gz: 4d76ffcdfb0303b4935e06ac32001d07ed3ad2c6c12c66a886fcace730dd0255
+  metadata.gz: 72bf123c2803dad061e343733c748d2c66ce4fb649e146cf089707b28bc24eb7
+  data.tar.gz: 808f8b5ede307bab1f5e3e933944e487113b8f22272fe6226d3411986e9a2eac
 SHA512:
-  metadata.gz: e0f98a7f12095cd875f90ef991c1a22a5de95dd107d315f2175928fa0cfa7292da7578bd2ab6a8292c876073d62ef9cb571ab3d00908702ed4a60dd945fb5019
-  data.tar.gz: f4a82f9a8dd26a01d2a9c1f21f26a1a6d8d265f5722c149f271cb4ee9bf6fe2dcd7f1517a950e751ddee3222dddd8e475332b874750f7ba9e56923e5f4cd7b28
+  metadata.gz: e39d5e003dd5ad5d48aa71b64b306c882413a27d873fb95c130cc00b5c4538271363f3a04cb44cfdd535a591c1c98479cc41a2558d5a0c7854bbb3793b6ce9b0
+  data.tar.gz: c39924d196aa19cbdf0db12a7660ac6ed7b545e78b6c6852261b9f178b4acc899ba3c8f9ee875042f2700849a2ef3b3db915d72805f5a47552d6c8d358e593c7

data/doc/text/news.md

@@ -1,5 +1,46 @@
 # News
 
+## 1.4.2: 2020-05-30
+
+### Improvements
+
+  * Removed log level normalization.
+
+  * Added `require-platform` directive.
+
+  * Added support for normalizing IO open/close log message with
+    additional message.
+
+## 1.4.1: 2020-05-30
+
+### Improvements
+
+  * Added support for normalizing IO open/close log message.
+
+## 1.4.0: 2020-05-16
+
+### Improvements
+
+  * Added support for normalizing mruby's syntax error message.
+
+## 1.3.9: 2020-05-09
+
+### Improvements
+
+  * Added `progress` reporter.
+
+  * Suppressed Apache Arrow related reports from Valgrind.
+
+  * Improved backtrace detection.
+
+## 1.3.8: 2020-04-23
+
+### Improvements
+
+  * Improved static port detection.
+
+  * Improved backtrace detection.
+
 ## 1.3.7: 2020-03-26
 
 ### Improvements

data/lib/grntest/execution-context.rb

@@ -37,6 +37,7 @@ module Grntest
     attr_writer :suppress_backtrace
     attr_writer :collect_query_log
     attr_writer :debug
+    attr_accessor :platform
     def initialize
       @logging = true
       @base_directory = Pathname(".")
@@ -66,6 +67,7 @@ module Grntest
       @suppress_backtrace = true
       @collect_query_log = false
       @debug = false
+      @platform = guess_platform
     end
 
     def logging?
@@ -173,5 +175,18 @@ module Grntest
         "so"
       end
     end
+
+    def guess_platform
+      case RUBY_PLATFORM
+      when /mingw|mswin/
+        "windows"
+      when /darwin/
+        "macos"
+      when /linux/
+        "linux"
+      else
+        "unknown"
+      end
+    end
   end
 end

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

@@ -374,6 +374,19 @@ module Grntest
         @ignore_log_patterns.delete(pattern)
       end
 
+      def execute_directive_require_platform(parser, line, content, options)
+        platform, = options
+        if platform.start_with?("!")
+          if @context.platform == platform[1..-1]
+            omit("require platform: #{platform} (#{@context.platform})")
+          end
+        else
+          if @context.platform != platform
+            omit("require platform: #{platform} (#{@context.platform})")
+          end
+        end
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -421,6 +434,8 @@ module Grntest
           execute_directive_add_ignore_log_pattern(parser, line, content, options)
         when "remove-ignore-log-pattern"
           execute_directive_remove_ignore_log_pattern(parser, line, content, options)
+        when "require-platform"
+          execute_directive_require_platform(parser, line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -535,12 +550,33 @@ module Grntest
           end
           next if thread_log_message?(entry.message)
           next if ignore_log_message?(entry.message)
-          formatted_log_level = format_log_level(entry.log_level)
-          important_messages << "\#|#{formatted_log_level}| #{entry.message}"
+          log_level, message = normalize_log(entry)
+          formatted_log_level = format_log_level(log_level)
+          important_messages << "\#|#{formatted_log_level}| #{message}"
         end
         important_messages.join("\n")
       end
 
+      def normalize_log(entry)
+        case entry.message
+        when /\A(\[io\]\[(?:open|close)\]) (.*?)<(.*?)>\z/
+          tag = $1
+          io_message = $2
+          path = $3
+          normalized_path = File.basename(path)
+          normalized_message = "#{tag} #{io_message}<#{normalized_path}>"
+          case entry.log_level
+          when :information, :debug
+            normalized_log_level = :dump
+          else
+            normalized_log_level = entry.log_level
+          end
+          [normalized_log_level, normalized_message]
+        else
+          [entry.log_level, entry.message]
+        end
+      end
+
       def read_all_readable_content(output, options={})
         content = ""
         first_timeout = options[:first_timeout] || @context.read_timeout
@@ -602,7 +638,16 @@ module Grntest
           true
         when /\A[a-zA-Z]:[\/\\]/
           true
-        when /\Agroonga\(\) \[0x[\da-f]+\]\z/
+        when /\A\(unknown\):\d+:\d+: /
+          true
+        when /\A(?:groonga|groonga-httpd)
+                \((?:\+0x\h+|\w+\+0x\h+)?\)
+                \s
+                \[0x\h+\]\z/x
+          # groonga() [0x564caf2bfc12]
+          # groonga(+0xbd1aa) [0x564caf2bfc12]
+          # groonga-httpd(+0xbd1aa) [0x564caf2bfc12]
+          # groonga-httpd(ngx_http_core_run_phases+0x25) [0x564caf2bfc12]
           true
         when /\A\d+\s+(?:lib\S+\.dylib|\S+\.so|groonga|nginx|\?\?\?)\s+
                 0x[\da-f]+\s

data/lib/grntest/reporters.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  Sutou Kouhei <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,6 +17,7 @@ require "grntest/reporters/mark-reporter"
 require "grntest/reporters/buffered-mark-reporter"
 require "grntest/reporters/stream-reporter"
 require "grntest/reporters/inplace-reporter"
+require "grntest/reporters/progress-reporter"
 
 module Grntest
   module Reporters
@@ -33,6 +32,8 @@ module Grntest
           StreamReporter.new(tester)
         when :inplace
           InplaceReporter.new(tester)
+        when :progress
+          ProgressReporter.new(tester)
         end
       end
     end

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

@@ -0,0 +1,37 @@
+# Copyright (C) 2020  Sutou Kouhei <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/inplace-reporter"
+
+module Grntest
+  module Reporters
+    class ProgressReporter < InplaceReporter
+      private
+      def draw_statistics_header_line
+        puts(statistics_header)
+      end
+
+      def draw_status_line(worker)
+      end
+
+      def draw_test_line(worker)
+      end
+
+      def n_worker_lines
+        0
+      end
+    end
+  end
+end

data/lib/grntest/test-runner.rb

@@ -297,6 +297,30 @@ call (int)chdir("#{context.temporary_directory_path}")
   match-leak-kinds: reachable
   ...
   fun:_dl_catch_error
+}
+{
+  _dl_init
+  Memcheck:Leak
+  match-leak-kinds: reachable
+  ...
+  fun:_dl_init
+  ...
+}
+{
+  _Z41__static_initialization_and_destruction_0ii
+  Memcheck:Leak
+  match-leak-kinds: reachable
+  ...
+  fun:_Z41__static_initialization_and_destruction_0ii
+  ...
+}
+{
+  je_arrow_private_je_background_thread_create
+  Memcheck:Leak
+  match-leak-kinds: possible
+  ...
+  fun:je_arrow_private_je_background_thread_create
+  ...
 }
           SUPPRESSIONS
         end
@@ -344,10 +368,10 @@ call (int)chdir("#{context.temporary_directory_path}")
       static_port = 50041 + @worker.id
       10.times do
         begin
-          TCPSocket.new(host, static_port)
+          TCPServer.open(host, static_port) do |server|
+            return static_port
+          end
         rescue SystemCallError
-          return static_port
-        else
           sleep(0.1)
         end
       end
@@ -787,6 +811,8 @@ http {
         pre = $1
         _path = $2
         "#{pre}<PATH>"
+      when /\A(line \d+:\d+: syntax error), unexpected .*\z/
+        $1
       else
         content
       end

data/lib/grntest/tester.rb

@@ -137,7 +137,13 @@ module Grntest
           diff_option_is_specified = true
         end
 
-        available_reporters = [:mark, :"buffered-mark", :stream, :inplace]
+        available_reporters = [
+          :mark,
+          :"buffered-mark",
+          :stream,
+          :inplace,
+          :progress,
+        ]
         available_reporter_labels = available_reporters.join(", ")
         parser.on("--reporter=REPORTER", available_reporters,
                   "Report test result by REPORTER",
@@ -371,7 +377,7 @@ module Grntest
         if @n_workers == 1
           :mark
         else
-          :inplace
+          :progress
         end
       else
         @reporter

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -238,6 +238,7 @@ files:
 - lib/grntest/reporters/buffered-mark-reporter.rb
 - lib/grntest/reporters/inplace-reporter.rb
 - lib/grntest/reporters/mark-reporter.rb
+- lib/grntest/reporters/progress-reporter.rb
 - lib/grntest/reporters/stream-reporter.rb
 - lib/grntest/response-parser.rb
 - lib/grntest/template-evaluator.rb