grntest 1.4.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88fbad2fdde680dc3110737087f9818240bd130ea4c61c14478d89577dd99420
-  data.tar.gz: e98f331062e055f4fd914ef1916dc4859614e1ef0c9f3a16c978d00d73d05a23
+  metadata.gz: 482d04165fd7dc5994528ae65d9c869440e45e6bad2c1851a96288f4a65c08a6
+  data.tar.gz: 479ba023a7ed7f2ccb9554160a102ed73fe4de173e7b225f63af6f72c9990750
 SHA512:
-  metadata.gz: 4e51b3927eb61e1232ade4c179a140eddd68d41d5231f4bee0e7b356cce389d8b72c110f5217418d9e214fa071486bd3ffe55e61e2e9def19b90b425e193e2ca
-  data.tar.gz: bd7a5ad8f297572b51f797f359ae2c42d9a01a013d6c48c6d3e168d648bf32af405ec0f8af36f1e0fef84a86756ccb2b918988a35696ed3af505e50dd23350bc
+  metadata.gz: 8e4f5687fbf84811d5ca93193407f00041fe5549a685e0181c1cde62564898c168386b94ce9c5882762309f0b6b91d30c18a25e09db3e4bb3fe76aa0d2e651a8
+  data.tar.gz: 05ccec382c7f186b3dad5fe75a10b50e10b3bf213e8021c4d22d288dcaffd94c7f79f03c625f718f593bcbea8d140937b10c8937de2962b426dfec6d38870682

data/doc/text/news.md

@@ -1,5 +1,32 @@
 # News
 
+## 1.5.0: 2021-07-16
+
+### Improvements
+
+  * `http`: Added response code check.
+
+  * `groonga-httpd`: Increased the max body size.
+
+## 1.4.9: 2021-07-12
+
+### Improvements
+
+  * Added `synonyms-generate` directive.
+
+## 1.4.8: 2020-12-09
+
+### Fixes
+
+  * `require-apache-arrow`: Fixed inverted Apache Arrow version check condition.
+
+## 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

data/lib/grntest/execution-context.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2021  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
@@ -20,6 +20,7 @@ module Grntest
     attr_accessor :plugins_directory
     attr_accessor :plugin_extension
     attr_accessor :groonga_suggest_create_dataset
+    attr_accessor :groonga_synonym_generate
     attr_accessor :testee
     attr_accessor :interface
     attr_accessor :result
@@ -46,6 +47,7 @@ module Grntest
       @plugins_directory = nil
       @plugin_extension = guess_plugin_extension
       @groonga_suggest_create_dataset = "groonga-suggest-create-dataset"
+      @groonga_synonym_generate = "groonga-synonym-generate"
       @testee = "groonga"
       @interface = "stdio"
       @n_nested = 0

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2021  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
@@ -45,7 +45,7 @@ module Grntest
         @custom_important_log_levels = []
         @ignore_log_patterns = {}
         @sleep_after_command = nil
-        @status_response = nil
+        @raw_status_response = nil
         @features = nil
       end
 
@@ -345,9 +345,27 @@ module Grntest
         end
       end
 
+      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
 
@@ -402,7 +420,7 @@ module Grntest
       def features
         return @features if @features
         @features = []
-        JSON.parse(@status_response)[1]["features"].each do |name, available|
+        status_response["features"].each do |name, available|
           @features << name if available
         end
         @features.sort!
@@ -426,6 +444,31 @@ module Grntest
         end
       end
 
+      def execute_directive_synonym_generate(parser, line, content, options)
+        if @context.groonga_synonym_generate.nil?
+          omit("groonga-synonym-generate isn't specified")
+        end
+
+        table, *args = options
+        command_line = [
+          @context.groonga_synonym_generate,
+          *args,
+        ]
+        packed_command_line = command_line.join(" ")
+        log_input("#{packed_command_line}\n")
+        begin
+          IO.popen(command_line, "r:ascii-8bit") do |io|
+            parser << "load --table #{table}\n"
+            io.each_line do |line|
+              parser << line
+            end
+          end
+        rescue SystemCallError
+          raise Error.new("failed to run groonga-synonym-generate: " +
+                          "<#{packed_command_line}>: #{$!}")
+        end
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -479,6 +522,8 @@ module Grntest
           execute_directive_sleep_after_command(line, content, options)
         when "require-feature"
           execute_directive_require_feature(line, content, options)
+        when "synonym-generate"
+          execute_directive_synonym_generate(parser, line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")

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

@@ -61,7 +61,7 @@ module Grntest
       def ensure_groonga_ready
         n_retried = 0
         begin
-          @status_response = send_command(command("status"))
+          @raw_status_response = send_command(command("status"))
         rescue Error
           n_retried += 1
           sleep(0.1)
@@ -78,6 +78,10 @@ module Grntest
       DEBUG = (ENV["GRNTEST_HTTP_DEBUG"] == "yes")
       LOAD_DEBUG = (DEBUG or (ENV["GRNTEST_HTTP_LOAD_DEBUG"] == "yes"))
 
+      def check_response(response)
+        response.value
+      end
+
       MAX_URI_SIZE = 4096
       def send_load_command(command)
         lines = command.original_source.lines
@@ -122,6 +126,7 @@ module Grntest
             http.read_timeout = read_timeout
             http.request(request)
           end
+          check_response(response)
           normalize_response_data(command, response.body)
         end
       end
@@ -144,6 +149,7 @@ module Grntest
             http.read_timeout = read_timeout
             http.request(request)
           end
+          check_response(response)
           normalize_response_data(command, response.body)
         end
       end
@@ -174,6 +180,10 @@ module Grntest
           message = "bad HTTP header syntax in Groonga response: <#{url}>: "
           message << "#{$!.class}: #{$!.message}"
           raise Error.new(message)
+        rescue Net::HTTPServerException
+          message = "exception from Groonga: <#{url}>: "
+          message << "#{$!.class}: #{$!.message}"
+          raise Error.new(message)
         end
       end
 

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

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

data/lib/grntest/test-runner.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2021  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
@@ -137,6 +137,8 @@ module Grntest
         context.plugins_directory = @tester.plugins_directory.expand_path
         context.groonga_suggest_create_dataset =
           @tester.groonga_suggest_create_dataset
+        context.groonga_synonym_generate =
+          @tester.groonga_synonym_generate
         context.testee = @tester.testee
         context.interface = @tester.interface
         context.use_http_post = @tester.use_http_post?
@@ -543,6 +545,7 @@ http {
                      groonga_log_path #{context.log_path};
                      groonga_query_log_path #{context.query_log_path};
                      groonga on;
+                     client_max_body_size 500m;
             }
      }
 }

data/lib/grntest/tester.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2021  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
@@ -56,6 +56,12 @@ module Grntest
           tester.groonga_suggest_create_dataset = normalize_command(command)
         end
 
+        parser.on("--groonga-synonym-generate=COMMAND",
+                  "Use COMMAND as groonga_synonym_generate command",
+                  "(#{tester.groonga_synonym_generate})") do |command|
+          tester.groonga_synonym_generate = normalize_command(command)
+        end
+
         available_interfaces = ["stdio", "http"]
         available_interface_labels = available_interfaces.join(", ")
         parser.on("--interface=INTERFACE", available_interfaces,
@@ -303,7 +309,10 @@ module Grntest
       end
     end
 
-    attr_accessor :groonga, :groonga_httpd, :groonga_suggest_create_dataset
+    attr_accessor :groonga
+    attr_accessor :groonga_httpd
+    attr_accessor :groonga_suggest_create_dataset
+    attr_accessor :groonga_synonym_generate
     attr_accessor :interface
     attr_writer :use_http_post
     attr_writer :use_http_chunked
@@ -334,6 +343,10 @@ module Grntest
       unless command_exist?(@groonga_suggest_create_dataset)
         @groonga_suggest_create_dataset = nil
       end
+      @groonga_synonym_generate = "groonga-synonym-generate"
+      unless command_exist?(@groonga_synonym_generate)
+        @groonga_synonym_generate = nil
+      end
       @interface = "stdio"
       @use_http_post = false
       @use_http_chunked = false

data/lib/grntest/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2021  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
@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.4.6"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.5.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2021-07-16 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.rc.2
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: Grntest is a testing framework for Groonga. You can write a test for Groonga