grntest 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a454a43f204e50c72ce0470713ee3dbcdd7c3b0f210f8fc37eb8c858dc5794f
-  data.tar.gz: 5f5a5dfdab82eefc86318b7a09e66c97979cb68fed0c498369117c0c98666a6a
+  metadata.gz: 3ba7e05aef3a6c662712ec931374dfb8889222eddc6716bc0c9efa0cf99cd882
+  data.tar.gz: 4d76ffcdfb0303b4935e06ac32001d07ed3ad2c6c12c66a886fcace730dd0255
 SHA512:
-  metadata.gz: 707db0020a332057b06ce4822edb4fd1cac2226e88f23a642fd071e2bda2457747f54fd22b16198b629badaee7e865753d60d0c713f35c40b1b718f1248a8866
-  data.tar.gz: 88653342fa0366047c2ecf080cc6d4bbab2f7c43186c9df4173fbeeb7814bf5a9143442ed1df7e4144674a2b0c977b109d0cfa2cf7927c20f489a74fc234370a
+  metadata.gz: e0f98a7f12095cd875f90ef991c1a22a5de95dd107d315f2175928fa0cfa7292da7578bd2ab6a8292c876073d62ef9cb571ab3d00908702ed4a60dd945fb5019
+  data.tar.gz: f4a82f9a8dd26a01d2a9c1f21f26a1a6d8d265f5722c149f271cb4ee9bf6fe2dcd7f1517a950e751ddee3222dddd8e475332b874750f7ba9e56923e5f4cd7b28

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 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,6 +534,7 @@ module Grntest
             next if !in_crash and backtrace_log_message?(entry.message)
           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}"
         end
@@ -592,6 +624,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/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.3.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 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-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs