grntest 1.4.2 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72bf123c2803dad061e343733c748d2c66ce4fb649e146cf089707b28bc24eb7
-  data.tar.gz: 808f8b5ede307bab1f5e3e933944e487113b8f22272fe6226d3411986e9a2eac
+  metadata.gz: 79fb44c3eebc5c70ba4d7a0c6821d653d77b6bb7c20791a86cd973bbf90fa970
+  data.tar.gz: 95ed0edd5d3f25e2f9d450edda7f0f58ad16354ab66c8163d9cfdc353610db6c
 SHA512:
-  metadata.gz: e39d5e003dd5ad5d48aa71b64b306c882413a27d873fb95c130cc00b5c4538271363f3a04cb44cfdd535a591c1c98479cc41a2558d5a0c7854bbb3793b6ce9b0
-  data.tar.gz: c39924d196aa19cbdf0db12a7660ac6ed7b545e78b6c6852261b9f178b4acc899ba3c8f9ee875042f2700849a2ef3b3db915d72805f5a47552d6c8d358e593c7
+  metadata.gz: bdfaf0c54e4dd784827fbb3f2ff34acfe1dce69ef168260ede87f6d570dd190490199aec105fc2a1357c6cd46a1b4da80c993373402044d0655dac821680921e
+  data.tar.gz: 583b24ab3901660faa706728df925c592dfaf8746df548f4bfee78a710b1bf10951bad1087b3df951ca8d8e8baecd5a00852b2cebd2eccd5fbf0f22f962e1332

data/doc/text/news.md

@@ -1,5 +1,36 @@
 # News
 
+## 1.4.7: 2020-12-08
+
+### Improvements
+
+  * `require-apache-arrow`: Added support for version check of Apache
+    Arrow in Groonga.
+
+## 1.4.6: 2020-12-08
+
+### Improvements
+
+  * Added `require-feature` directive.
+
+## 1.4.5: 2020-11-11
+
+### Improvements
+
+  * Added `sleep-after-command` directive.
+
+## 1.4.4: 2020-07-18
+
+### Improvements
+
+  * Added support for detecting backtrace log for MinGW build.
+
+## 1.4.3: 2020-05-31
+
+### Improvements
+
+  * Removed log normalization.
+
 ## 1.4.2: 2020-05-30
 
 ### Improvements

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

@@ -44,6 +44,9 @@ module Grntest
         @context = context
         @custom_important_log_levels = []
         @ignore_log_patterns = {}
+        @sleep_after_command = nil
+        @raw_status_response = nil
+        @features = nil
       end
 
       def execute(script_path)
@@ -321,30 +324,48 @@ module Grntest
         parser << "#{expand_variables(groonga_command)}\n"
       end
 
-      def execute_directive_require_input_type(parser, line, content, options)
+      def execute_directive_require_input_type(line, content, options)
         input_type, = options
         unless @context.input_type == input_type
           omit("require input type: #{input_type}")
         end
       end
 
-      def execute_directive_require_testee(parser, line, content, options)
+      def execute_directive_require_testee(line, content, options)
         testee, = options
         unless @context.testee == testee
           omit("require testee: #{testee}")
         end
       end
 
-      def execute_directive_require_interface(parser, line, content, options)
+      def execute_directive_require_interface(line, content, options)
         interface, = options
         unless @context.interface == interface
           omit("require interface: #{interface}")
         end
       end
 
-      def execute_directive_require_apache_arrow(parser, line, content, options)
+      def status_response
+        @status_response ||= JSON.parse(@raw_status_response)[1]
+      end
+
+      def apache_arrow_version
+        (status_response["apache_arrow"] || {})["version"]
+      end
+
+      def execute_directive_require_apache_arrow(line, content, options)
+        version, = options
+        _apache_arrow_version = apache_arrow_version
+        if _apache_arrow_version.nil?
+          omit("require Apache Arrow support in Groonga")
+        end
         unless defined?(::Arrow)
-          omit("require Apache Arrow")
+          omit("require Red Arrow in grntest")
+        end
+        return if version.nil?
+        if Gem::Version.new(version) < Gem::Version.new(_apache_arrow_version)
+          omit("require Apache Arrow #{version} in Groonga: " +
+               _apache_arrow_version)
         end
       end
 
@@ -364,17 +385,17 @@ module Grntest
         end
       end
 
-      def execute_directive_add_ignore_log_pattern(parser, line, content, options)
+      def execute_directive_add_ignore_log_pattern(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)
+      def execute_directive_remove_ignore_log_pattern(line, content, options)
         pattern = content.split(" ", 2)[1]
         @ignore_log_patterns.delete(pattern)
       end
 
-      def execute_directive_require_platform(parser, line, content, options)
+      def execute_directive_require_platform(line, content, options)
         platform, = options
         if platform.start_with?("!")
           if @context.platform == platform[1..-1]
@@ -387,6 +408,42 @@ module Grntest
         end
       end
 
+      def execute_directive_sleep_after_command(line, content, options)
+        if options[0]
+          time = options[0].to_f
+        else
+          time = nil
+        end
+        @sleep_after_command = time
+      end
+
+      def features
+        return @features if @features
+        @features = []
+        status_response["features"].each do |name, available|
+          @features << name if available
+        end
+        @features.sort!
+        @features
+      end
+
+      def formatted_features
+        features.join(", ")
+      end
+
+      def execute_directive_require_feature(line, content, options)
+        feature, = options
+        if feature.start_with?("!")
+          if features.include?(feature[1..-1])
+            omit("require feature: #{feature} (#{formatted_features})")
+          end
+        else
+          unless features.include?(feature)
+            omit("require feature: #{feature} (#{formatted_features})")
+          end
+        end
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -423,19 +480,23 @@ module Grntest
         when "eval"
           execute_directive_eval(parser, line, content, options)
         when "require-input-type"
-          execute_directive_require_input_type(parser, line, content, options)
+          execute_directive_require_input_type(line, content, options)
         when "require-testee"
-          execute_directive_require_testee(parser, line, content, options)
+          execute_directive_require_testee(line, content, options)
         when "require-interface"
-          execute_directive_require_interface(parser, line, content, options)
+          execute_directive_require_interface(line, content, options)
         when "require-apache-arrow"
-          execute_directive_require_apache_arrow(parser, line, content, options)
+          execute_directive_require_apache_arrow(line, content, options)
         when "add-ignore-log-pattern"
-          execute_directive_add_ignore_log_pattern(parser, line, content, options)
+          execute_directive_add_ignore_log_pattern(line, content, options)
         when "remove-ignore-log-pattern"
-          execute_directive_remove_ignore_log_pattern(parser, line, content, options)
+          execute_directive_remove_ignore_log_pattern(line, content, options)
         when "require-platform"
-          execute_directive_require_platform(parser, line, content, options)
+          execute_directive_require_platform(line, content, options)
+        when "sleep-after-command"
+          execute_directive_sleep_after_command(line, content, options)
+        when "require-feature"
+          execute_directive_require_feature(line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -501,6 +562,7 @@ module Grntest
         else
           type = @output_type
           log_output(response)
+          sleep(@sleep_after_command) if @sleep_after_command
           log_error(extract_important_messages(read_all_log))
           log_query_log_content(read_all_query_log)
 
@@ -550,33 +612,14 @@ module Grntest
           end
           next if thread_log_message?(entry.message)
           next if ignore_log_message?(entry.message)
-          log_level, message = normalize_log(entry)
+          log_level = entry.log_level
           formatted_log_level = format_log_level(log_level)
+          message = entry.message
           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
@@ -640,6 +683,8 @@ module Grntest
           true
         when /\A\(unknown\):\d+:\d+: /
           true
+        when /\A[\w.\\-]+:\d+:\d+: /
+          true
         when /\A(?:groonga|groonga-httpd)
                 \((?:\+0x\h+|\w+\+0x\h+)?\)
                 \s

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

@@ -61,7 +61,7 @@ module Grntest
       def ensure_groonga_ready
         n_retried = 0
         begin
-          send_command(command("status"))
+          @raw_status_response = send_command(command("status"))
         rescue Error
           n_retried += 1
           sleep(0.1)

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

@@ -44,7 +44,7 @@ module Grntest
       def ensure_groonga_ready
         @input.print("status\n")
         @input.flush
-        @output.gets
+        @raw_status_response = @output.gets
       end
 
       def create_sub_executor(context)

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.7
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
+rubygems_version: 3.2.0.rc.2
 signing_key: 
 specification_version: 4
 summary: Grntest is a testing framework for Groonga. You can write a test for Groonga