grntest 1.4.7 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79fb44c3eebc5c70ba4d7a0c6821d653d77b6bb7c20791a86cd973bbf90fa970
-  data.tar.gz: 95ed0edd5d3f25e2f9d450edda7f0f58ad16354ab66c8163d9cfdc353610db6c
+  metadata.gz: f74f96285e7ff0f9537ae2165f7fba29a9fb705a686e98f1281f7203b46521c5
+  data.tar.gz: 89d86885e7b67cb0f98312856be0ed6cbb2f0264a4ba281fe8ca542f06e39dad
 SHA512:
-  metadata.gz: bdfaf0c54e4dd784827fbb3f2ff34acfe1dce69ef168260ede87f6d570dd190490199aec105fc2a1357c6cd46a1b4da80c993373402044d0655dac821680921e
-  data.tar.gz: 583b24ab3901660faa706728df925c592dfaf8746df548f4bfee78a710b1bf10951bad1087b3df951ca8d8e8baecd5a00852b2cebd2eccd5fbf0f22f962e1332
+  metadata.gz: a6964575dd5fd1e3ec6160416795e10f6ac720f7bedee4413167196b055278f0196dac8dc017f620843c485cb4277ee20dbebddc0ab5ce3a242577d0008214f3
+  data.tar.gz: 4ab4f3f9925b14ef915eb781e0a02e53d1039549b035b830f51a0016f421fb31372631d8398824bb41563bc50b966eca7ad67916e2ef660123e0672235de9080

data/doc/text/news.md

@@ -1,5 +1,31 @@
 # News
 
+## 1.5.1: 2021-07-16
+
+### Improvements
+
+  * `http`: Improved response check.
+
+## 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

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
@@ -363,7 +363,7 @@ module Grntest
           omit("require Red Arrow in grntest")
         end
         return if version.nil?
-        if Gem::Version.new(version) < Gem::Version.new(_apache_arrow_version)
+        if Gem::Version.new(version) > Gem::Version.new(_apache_arrow_version)
           omit("require Apache Arrow #{version} in Groonga: " +
                _apache_arrow_version)
         end
@@ -444,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
@@ -497,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

@@ -78,6 +78,18 @@ module Grntest
       DEBUG = (ENV["GRNTEST_HTTP_DEBUG"] == "yes")
       LOAD_DEBUG = (DEBUG or (ENV["GRNTEST_HTTP_LOAD_DEBUG"] == "yes"))
 
+      def check_response(response)
+        case response
+        when Net::HTTPBadRequest,
+             Net::HTTPNotFound
+          # Groonga returns them for an invalid request.
+        when Net::HTTPInternalServerError
+          # Groonga returns this for an internal error.
+        else
+          response.value
+        end
+      end
+
       MAX_URI_SIZE = 4096
       def send_load_command(command)
         lines = command.original_source.lines
@@ -122,6 +134,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 +157,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 +188,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/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.7"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.5.1
 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