grntest 1.4.3 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84355faab0bb4ff5b7dbe5f1ef43a0ca2c93203fcd99b56282d0800a222a976e
-  data.tar.gz: c289cb84bdf272373db014e586ecfcb1ea9d3961ea48e6f6958bc430e1f493ad
+  metadata.gz: 6573acc74d9d0be5726b91bf8e357ece4d5170dece4bfe9595ca86155f91c31b
+  data.tar.gz: 5d56939d8117fa73f7d5a3c9b8d52c34b270d15ee5a639debcbf250f43bdff9b
 SHA512:
-  metadata.gz: d71f9f4c07114875886817223c31c10309cfea941aafcef780fc34d3366688cccf6df1c36287b1b9019faa9d2727f6918267fa2758e040673145e230faa88080
-  data.tar.gz: 50627e7af040b161e34a6d2b756f4642940fb7b8a2fffbd0c1751d0fb9b240fa27a0c975ca6c57023f5a90c92616d7bb263497192d875040e17d68121da708ac
+  metadata.gz: 8a538e223a7a30328cf0e32a144567175542d6b46342065ac19ba58873133c1744553dd635d4258ae917770d0a345b0302f5888828aee64db18170689b21cb1a
+  data.tar.gz: 3170beeb6430e8b7ab1e065348e92498e6d7df0d7a974fb1ec7ad6304f6bf6662c7d44f2456f8e598a01501364355cfbcc0fef46e4f711ae553d2710c33bf177

data/doc/text/news.md

@@ -1,5 +1,36 @@
 # News
 
+## 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
+
+  * Added support for detecting backtrace log for MinGW build.
+
 ## 1.4.3: 2020-05-31
 
 ### 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)
 
@@ -621,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.3"
+  VERSION = "1.4.8"
 end

metadata

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