grntest 1.3.6 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a454a43f204e50c72ce0470713ee3dbcdd7c3b0f210f8fc37eb8c858dc5794f
-  data.tar.gz: 5f5a5dfdab82eefc86318b7a09e66c97979cb68fed0c498369117c0c98666a6a
+  metadata.gz: 8e90468027680b461a1633c49db9f3feb7babd1a0c2e81a4aad381ade35b4fb3
+  data.tar.gz: 31b1cc050ea4b70ed08082a0b5443586676aa5d77c0512287736ee1837b4c371
 SHA512:
-  metadata.gz: 707db0020a332057b06ce4822edb4fd1cac2226e88f23a642fd071e2bda2457747f54fd22b16198b629badaee7e865753d60d0c713f35c40b1b718f1248a8866
-  data.tar.gz: 88653342fa0366047c2ecf080cc6d4bbab2f7c43186c9df4173fbeeb7814bf5a9143442ed1df7e4144674a2b0c977b109d0cfa2cf7927c20f489a74fc234370a
+  metadata.gz: f8067b106d13ebd121cd96d43eb82b807adb81fe89ea26df1ea4eeb8dfdd6be096e14fdbeeb6ca00528d5704d0d53d6123e28d45973fb5bb283990c59101e090
+  data.tar.gz: b8eb794be911a7dc8b7eb74172b4cb109cafe74a945cfc3ca3e626d90a54a36ca61058c91883238b579d4c0a92578a58d46b2aff4a7dbb1c4086059a0109245e

data/doc/text/news.md

@@ -1,5 +1,43 @@
 # News
 
+## 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
+
+  * Added `add-ignore-log-pattern` directive.
+
+  * Added `remove-ignore-log-pattern` directive.
+
 ## 1.3.6: 2020-03-26
 
 ### Improvements

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

@@ -43,6 +43,7 @@ module Grntest
         @long_read_timeout = default_long_read_timeout
         @context = context
         @custom_important_log_levels = []
+        @ignore_log_patterns = {}
       end
 
       def execute(script_path)
@@ -347,6 +348,32 @@ module Grntest
         end
       end
 
+      def compile_pattern(pattern)
+        case pattern
+        when /\A\/(.*)\/([ixm]*)?\z/
+          content = $1
+          options = $2
+          regexp_flags = 0
+          regexp_flags |= Regexp::IGNORECASE if options.include?("i")
+          regexp_flags |= Regexp::EXTENDED if options.include?("x")
+          regexp_flags |= Regexp::MULTILINE if options.include?("m")
+          Regexp.new(content, regexp_flags)
+        else
+          log_error("# error: invalid pattern: #{pattern}")
+          @context.error
+        end
+      end
+
+      def execute_directive_add_ignore_log_pattern(parser, line, content, options)
+        pattern = content.split(" ", 2)[1]
+        @ignore_log_patterns[pattern] = compile_pattern(pattern)
+      end
+
+      def execute_directive_remove_ignore_log_pattern(parser, line, content, options)
+        pattern = content.split(" ", 2)[1]
+        @ignore_log_patterns.delete(pattern)
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -390,6 +417,10 @@ module Grntest
           execute_directive_require_interface(parser, line, content, options)
         when "require-apache-arrow"
           execute_directive_require_apache_arrow(parser, line, content, options)
+        when "add-ignore-log-pattern"
+          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)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -503,12 +534,33 @@ module Grntest
             next if !in_crash and backtrace_log_message?(entry.message)
           end
           next if thread_log_message?(entry.message)
-          formatted_log_level = format_log_level(entry.log_level)
-          important_messages << "\#|#{formatted_log_level}| #{entry.message}"
+          next if ignore_log_message?(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
+          path = $2
+          normalized_path = File.basename(path)
+          normalized_message = "#{tag} <#{normalized_path}>"
+          case entry.log_level
+          when :info, :debug
+            normalized_log_level = :debug
+          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
@@ -570,7 +622,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
@@ -592,6 +653,12 @@ module Grntest
         end
       end
 
+      def ignore_log_message?(message)
+        @ignore_log_patterns.any? do |_pattern, regexp|
+          regexp === message
+        end
+      end
+
       def error_response?(response, type)
         status = nil
         begin

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.1
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 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