grntest 1.4.4 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9733d4f25a25296b60589e7c0328872954955799278fa0194a82c279c92c5f84
-  data.tar.gz: 653013c00c4f38eb2c9d41edf5963fd4ccafe6a491672e5afd6d4b4b7b8dad15
+  metadata.gz: e027a36e3f3e1206e89cf0cc617a5e892074bd207ee46f29ebccf9b68bf25bc0
+  data.tar.gz: 4393ff236546341e6abba56083164ed4bdd51564a3acc0b3087ac2bf1cc6fec1
 SHA512:
-  metadata.gz: f395c3c2eb4949842e4eefcf933ca13a71662d3b7f192e33441a91c8b69bc7a9edad21602743cb069f7247c4675ec0fc3baa738a70211bbe8963fb594f853d95
-  data.tar.gz: 6075f8e1009aff8baf34824cb125468b45809ea8465077e27d7d80b10864a5ebe8790abda81336a2da220840583c97f53e417e9f7139da718bd2706140860ded
+  metadata.gz: 14748646fa504319011a9cd649c732ae644ef2b7ec73a402f9740dda5a0f125e38dba7b227a4873766cc31777daf5d9407e9ab7ea5dd328f20eb858474c9a028
+  data.tar.gz: f34f315596201dec45cc177bfd0edba7f40f3dede8c6d8a046a28cf85fabf47ef1703340bc6008c60c751eda5712e38ea3bb0e52447118556536a93804a6a817

data/doc/text/news.md

@@ -1,5 +1,36 @@
 # News
 
+## 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
+
+  * Added `require-feature` directive.
+
+## 1.4.5: 2020-11-11
+
+### Improvements
+
+  * Added `sleep-after-command` directive.
+
 ## 1.4.4: 2020-07-18
 
 ### 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
@@ -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,67 @@ 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_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
@@ -423,19 +505,25 @@ 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)
+        when "synonym-generate"
+          execute_directive_synonym_generate(parser, line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -501,6 +589,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)
 

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/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?

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

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.4.4"
+  VERSION = "1.4.9"
 end

metadata

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