grntest 1.4.8 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6573acc74d9d0be5726b91bf8e357ece4d5170dece4bfe9595ca86155f91c31b
-  data.tar.gz: 5d56939d8117fa73f7d5a3c9b8d52c34b270d15ee5a639debcbf250f43bdff9b
+  metadata.gz: b52bcc8e04c96ff7cbda13f71af169b3c76fcc89fe048f5906db096f92410742
+  data.tar.gz: 96796b1ffe639b555606acdc3181a1e0fd90cd82edc6b6e914e31c378e886ae7
 SHA512:
-  metadata.gz: 8a538e223a7a30328cf0e32a144567175542d6b46342065ac19ba58873133c1744553dd635d4258ae917770d0a345b0302f5888828aee64db18170689b21cb1a
-  data.tar.gz: 3170beeb6430e8b7ab1e065348e92498e6d7df0d7a974fb1ec7ad6304f6bf6662c7d44f2456f8e598a01501364355cfbcc0fef46e4f711ae553d2710c33bf177
+  metadata.gz: 7ad0556248d06ee80940677b7e1e7419e931d06981b47875d7a363637c9a0c6d387c08daafc09fe9c2b3cbbba2e6ea75b4402a6b0209dbc4433dbba652befa3f
+  data.tar.gz: 5a46df9665ae1aca3201b1867792e30892caca2e5a93d0ea7cb84f29e779596e80f3bfcb7056780e9f0fe0fbce5cc35abac41fce3ec2fdd0c40f03376096e897

data/doc/text/news.md

@@ -1,5 +1,35 @@
 # News
 
+## 1.5.2: 2021-08-05
+
+### Improvements
+
+  * `stdio`: Improved may be slow command processing.
+
+  * `copy-path`: Handled error.
+
+  * `generate-series`: Improved multi threading support.
+
+## 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

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
@@ -180,7 +180,14 @@ module Grntest
         end
         source = resolve_path(Pathname(expand_variables(source)))
         destination = resolve_path(Pathname(expand_variables(destination)))
-        FileUtils.cp_r(source.to_s, destination.to_s)
+        begin
+          FileUtils.cp_r(source.to_s, destination.to_s)
+        rescue SystemCallError => error
+          log_input(line)
+          details = "#{error.class}: #{error.message}"
+          log_error("#|e| [copy-path] failed to copy: #{details}")
+          @context.error
+        end
       end
 
       def timeout_value(key, line, input, default)
@@ -313,7 +320,10 @@ module Grntest
             end
             record << "\n"
             record << evaluator.evaluate(i).to_json
+            before = Time.now
             parser << record
+            elapsed = Time.now - before
+            Thread.pass if elapsed > 1.0
           end
           parser << "\n]\n"
         end
@@ -444,6 +454,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 +532,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/executors/standard-io-executor.rb

@@ -65,10 +65,12 @@ module Grntest
 
       MAY_SLOW_COMMANDS = [
         "column_create",
+        "delete",
         "load",
         "logical_table_remove",
         "plugin_register",
         "register",
+        "wal_recover",
       ]
       def may_slow_command?(command)
         MAY_SLOW_COMMANDS.include?(command.name)

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.8"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.5.2
 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-08-05 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