grntest 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c74faa2722964ab0d9f2f78a7fea2e3e1275d28e0639c10f9bfaef7597d3e73f
-  data.tar.gz: b0462e4805ec8c3c04b81a3330be27ad8af703a1dbcdb95db08ef28e954f6a95
+  metadata.gz: 4a454a43f204e50c72ce0470713ee3dbcdd7c3b0f210f8fc37eb8c858dc5794f
+  data.tar.gz: 5f5a5dfdab82eefc86318b7a09e66c97979cb68fed0c498369117c0c98666a6a
 SHA512:
-  metadata.gz: 3d10fa6674ffa249bc0555fad4b460d48505b4cc8abdc640956ebd403b3784ac1bf80f52a5bd39e5956167904bd0eb4624e8b0dc3f3fe1cfc9c923bad88d9ad5
-  data.tar.gz: 60133bca88d982074f54cc3426298d692fb34c3432e800c1f1427c4de2af2ca158a28415456b670d81502f1fc87fc26cb5b7e11c09a1df4770dec34b44602ca1
+  metadata.gz: 707db0020a332057b06ce4822edb4fd1cac2226e88f23a642fd071e2bda2457747f54fd22b16198b629badaee7e865753d60d0c713f35c40b1b718f1248a8866
+  data.tar.gz: 88653342fa0366047c2ecf080cc6d4bbab2f7c43186c9df4173fbeeb7814bf5a9143442ed1df7e4144674a2b0c977b109d0cfa2cf7927c20f489a74fc234370a

data/.yardopts

@@ -1,5 +1,5 @@
 --output-dir doc/reference/en
 --markup markdown
---markup-provider redcarpet
+--markup-provider kramdown
 -
 doc/text/*

data/doc/text/news.md

@@ -1,5 +1,26 @@
 # News
 
+## 1.3.6: 2020-03-26
+
+### Improvements
+
+  * standard-io: Added support for stream output
+
+  * Added `require-testee` directive.
+
+  * Added `require-interface` directive.
+
+  * Added support for Apache Arrow.
+
+  * Added `require-apache-arrow` directive.
+
+  * http: Added support for debug log by `GRNTEST_HTTP_DEBUG`
+    environment variable.
+
+  * Added `--use-http-chunked` option.
+
+  * Stopped counting test failures on retry.
+
 ## 1.3.5: 2020-03-02
 
 ### Improvements

data/grntest.gemspec

@@ -53,9 +53,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("rexml")
 
   spec.add_development_dependency("bundler")
+  spec.add_development_dependency("kramdown")
+  spec.add_development_dependency("packnga")
   spec.add_development_dependency("rake")
   spec.add_development_dependency("test-unit", ">= 3.0.0")
   spec.add_development_dependency("test-unit-rr")
-  spec.add_development_dependency("packnga")
-  spec.add_development_dependency("redcarpet")
 end

data/lib/grntest/execution-context.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  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,8 +20,11 @@ module Grntest
     attr_accessor :plugins_directory
     attr_accessor :plugin_extension
     attr_accessor :groonga_suggest_create_dataset
+    attr_accessor :testee
+    attr_accessor :interface
     attr_accessor :result
     attr_writer :use_http_post
+    attr_writer :use_http_chunked
     attr_accessor :input_type
     attr_accessor :output_type
     attr_accessor :on_error
@@ -42,9 +45,12 @@ module Grntest
       @plugins_directory = nil
       @plugin_extension = guess_plugin_extension
       @groonga_suggest_create_dataset = "groonga-suggest-create-dataset"
+      @testee = "groonga"
+      @interface = "stdio"
       @n_nested = 0
       @result = []
       @use_http_post = false
+      @use_http_chunked = false
       @input_type = "json"
       @output_type = "json"
       @log = nil
@@ -70,6 +76,10 @@ module Grntest
       @use_http_post
     end
 
+    def use_http_chunked?
+      @use_http_chunked
+    end
+
     def suppress_backtrace?
       @suppress_backtrace or debug?
     end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  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
@@ -327,6 +327,26 @@ module Grntest
         end
       end
 
+      def execute_directive_require_testee(parser, line, content, options)
+        testee, = options
+        unless @context.testee == testee
+          omit("require testee: #{testee}")
+        end
+      end
+
+      def execute_directive_require_interface(parser, 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)
+        unless defined?(::Arrow)
+          omit("require Apache Arrow")
+        end
+      end
+
       def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
@@ -364,6 +384,12 @@ module Grntest
           execute_directive_eval(parser, line, content, options)
         when "require-input-type"
           execute_directive_require_input_type(parser, line, content, options)
+        when "require-testee"
+          execute_directive_require_testee(parser, line, content, options)
+        when "require-interface"
+          execute_directive_require_interface(parser, line, content, options)
+        when "require-apache-arrow"
+          execute_directive_require_apache_arrow(parser, line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -402,11 +428,12 @@ module Grntest
         if @current_command.name == "dump"
           @output_type = "groonga-command"
         else
-          @output_type = @current_command[:output_type] || @context.output_type
+          @output_type = @current_command[:output_type]
         end
       end
 
       def execute_command(command)
+        command[:output_type] ||= @context.output_type
         extract_command_info(command)
         log_input("#{command.original_source}\n")
         timeout = @context.timeout
@@ -423,6 +450,7 @@ module Grntest
           error.backtrace.each do |line|
             log_error("# error: #{line}")
           end
+          log_error(read_all_log)
           @context.error
         else
           type = @output_type
@@ -491,7 +519,13 @@ module Grntest
           read_content = output.readpartial(request_bytes)
           debug_output(read_content)
           content << read_content
-          timeout = 0 if read_content.bytesize < request_bytes
+          if read_content.bytesize < request_bytes
+            if options[:stream_output]
+              timeout = 0.1
+            else
+              timeout = 0
+            end
+          end
         end
         content
       end

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

@@ -21,6 +21,29 @@ require "grntest/executors/base-executor"
 module Grntest
   module Executors
     class HTTPExecutor < BaseExecutor
+      class SlowBodyStream
+        def initialize(body)
+          @body = body || ""
+          @offset = 0
+        end
+
+        def read(length=nil, output="")
+          if @offset >= @body.bytesize
+            nil
+          else
+            if length.nil?
+              output.replace(@body.byteslice(@offset..-1))
+              @offset = @body.bytesize
+              output
+            else
+              output.replace(@body.byteslice(@offset, 1))
+              @offset += 1
+              output
+            end
+          end
+        end
+      end
+
       def initialize(host, port, context)
         super(context)
         @host = host
@@ -52,6 +75,9 @@ module Grntest
       end
 
       private
+      DEBUG = (ENV["GRNTEST_HTTP_DEBUG"] == "yes")
+      LOAD_DEBUG = (DEBUG or (ENV["GRNTEST_HTTP_LOAD_DEBUG"] == "yes"))
+
       MAX_URI_SIZE = 4096
       def send_load_command(command)
         lines = command.original_source.lines
@@ -84,14 +110,20 @@ module Grntest
             body = values
           end
         end
-        request = Net::HTTP::Post.new(command.to_uri_format)
+        path = command.to_uri_format
+        url = "http://#{@host}:#{@port}#{path}"
+        request = Net::HTTP::Post.new(path)
         request.content_type = content_type
-        request.body = body
-        response = Net::HTTP.start(@host, @port) do |http|
-          http.read_timeout = read_timeout
-          http.request(request)
+        set_request_body(request, body)
+        run_http_request(url) do
+          http = Net::HTTP.new(@host, @port)
+          http.set_debug_output($stderr) if LOAD_DEBUG
+          response = http.start do
+            http.read_timeout = read_timeout
+            http.request(request)
+          end
+          normalize_response_data(command, response.body)
         end
-        normalize_response_data(command, response.body)
       end
 
       def send_normal_command(command)
@@ -100,20 +132,40 @@ module Grntest
           path, query = path_with_query.split("?", 2)
           request = Net::HTTP::Post.new(path)
           request.content_type = "application/x-www-form-urlencoded"
-          request.body = query
+          set_request_body(request, query)
         else
           request = Net::HTTP::Get.new(path_with_query)
         end
         url = "http://#{@host}:#{@port}#{path_with_query}"
-        begin
-          response = Net::HTTP.start(@host, @port) do |http|
+        run_http_request(url) do
+          http = Net::HTTP.new(@host, @port)
+          http.set_debug_output($stderr) if DEBUG
+          response = http.start do
             http.read_timeout = read_timeout
             http.request(request)
           end
           normalize_response_data(command, response.body)
+        end
+      end
+
+      def set_request_body(request, body)
+        if @context.use_http_chunked?
+          request["Transfer-Encoding"] = "chunked"
+          request.body_stream = SlowBodyStream.new(body)
+        else
+          request.body = body
+        end
+      end
+
+      def run_http_request(url)
+        begin
+          yield
         rescue SystemCallError
           message = "failed to read response from Groonga: <#{url}>: #{$!}"
           raise Error.new(message)
+        rescue EOFError
+          message = "unexpected EOF response from Groonga: <#{url}>: #{$!}"
+          raise Error.new(message)
         rescue Net::HTTPBadResponse
           message = "bad response from Groonga: <#{url}>: "
           message << "#{$!.class}: #{$!.message}"
@@ -126,11 +178,10 @@ module Grntest
       end
 
       def normalize_response_data(command, raw_response_data)
-        if raw_response_data.empty? or command.output_type == :none
-          raw_response_data
-        else
-          "#{raw_response_data}\n"
-        end
+        return raw_response_data if raw_response_data.empty?
+        return raw_response_data if command.output_type == :none
+        return raw_response_data if command.output_type == :"apache-arrow"
+        "#{raw_response_data}\n"
       end
 
       def read_timeout

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

@@ -57,6 +57,9 @@ module Grntest
         if may_slow_command?(command)
           options[:first_timeout] = @long_read_timeout
         end
+        if may_stream_output_command?(command)
+          options[:stream_output] = true
+        end
         read_all_readable_content(@output, options)
       end
 
@@ -70,6 +73,14 @@ module Grntest
       def may_slow_command?(command)
         MAY_SLOW_COMMANDS.include?(command.name)
       end
+
+      MAY_STREAM_OUTPUT_COMMANDS = [
+        "dump",
+        "logical_range_filter",
+      ]
+      def may_stream_output_command?(command)
+        MAY_STREAM_OUTPUT_COMMANDS.include?(command.name)
+      end
     end
   end
 end

data/lib/grntest/test-runner.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  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,7 +137,10 @@ module Grntest
         context.plugins_directory = @tester.plugins_directory.expand_path
         context.groonga_suggest_create_dataset =
           @tester.groonga_suggest_create_dataset
+        context.testee = @tester.testee
+        context.interface = @tester.interface
         context.use_http_post = @tester.use_http_post?
+        context.use_http_chunked = @tester.use_http_chunked?
         context.input_type = @tester.input_type
         context.output_type = @tester.output_type
         context.timeout = @tester.timeout
@@ -187,9 +190,9 @@ module Grntest
       catch do |tag|
         context.abort_tag = tag
         case @tester.interface
-        when :stdio
+        when "stdio"
           run_groonga_stdio(context, &block)
-        when :http
+        when "http"
           run_groonga_http(context, &block)
         end
       end
@@ -580,6 +583,8 @@ http {
       case type
       when "json", "msgpack"
         normalize_output_structured(type, content, options)
+      when "apache-arrow"
+        normalize_apache_arrow_content(content, options)
       when "xml"
         normalized_xml = normalize_output_xml(content, options)
         normalize_raw_content(normalized_xml)
@@ -634,6 +639,54 @@ http {
       end
     end
 
+    def normalize_apache_arrow_content(content, options)
+      normalized = ""
+      buffer = Arrow::Buffer.new(content)
+      Arrow::BufferInputStream.open(buffer) do |input|
+        while input.tell < content.bytesize
+          reader = Arrow::RecordBatchStreamReader.new(input)
+          schema = reader.schema
+          record_batches = reader.to_a
+          table = Arrow::Table.new(schema, record_batches)
+          unless normalized.empty?
+            normalized << "=" * 40
+            normalized << "\n"
+          end
+          if schema.respond_to?(:to_string_metadata)
+            normalized << schema.to_string_metadata(true)
+          else
+            normalized << schema.to_s
+          end
+          normalized << "\n"
+          if apache_arrow_metadata?(schema)
+            normalized_records = table.each_record.collect do |record|
+              normalized_record = []
+              record.to_h.each do |name, value|
+                case name
+                when "start_time", "elapsed_time"
+                  value = 0
+                end
+                normalized_record << value
+              end
+              normalized_record
+            end
+            noramlized_table = Arrow::Table.new(schema, normalized_records)
+            normalized << noramlized_table.to_s
+          else
+            normalized << table.to_s
+          end
+        end
+      end
+      normalized
+    end
+
+    def apache_arrow_metadata?(schema)
+      # TODO: Use schema.metadata with gobject-introspection 3.4.2 and
+      # Red Arrow 0.17.0.
+      schema.fields.collect(&:name) ==
+        ["return_code", "start_time", "elapsed_time"]
+    end
+
     def normalize_output_xml(content, options)
       content.sub(/^<RESULT .+?>/) do |result|
         result.gsub(/( (?:UP|ELAPSED))="\d+\.\d+(?:e[+-]?\d+)?"/, '\1="0.0"')

data/lib/grntest/tester.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2020  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,7 +56,7 @@ module Grntest
           tester.groonga_suggest_create_dataset = normalize_command(command)
         end
 
-        available_interfaces = [:stdio, :http]
+        available_interfaces = ["stdio", "http"]
         available_interface_labels = available_interfaces.join(", ")
         parser.on("--interface=INTERFACE", available_interfaces,
                   "Use INTERFACE for communicating Groonga",
@@ -71,6 +71,12 @@ module Grntest
           tester.use_http_post = boolean
         end
 
+        parser.on("--[no-]use-http-chunked",
+                  "Use chunked Transfer-Encoding to send body by HTTP",
+                  "(#{tester.use_http_chunked?})") do |boolean|
+          tester.use_http_chunked = boolean
+        end
+
         available_input_types = ["json", "apache-arrow"]
         available_input_type_labels = available_input_types.join(", ")
         parser.on("--input-type=TYPE", available_input_types,
@@ -80,7 +86,7 @@ module Grntest
           tester.input_type = type
         end
 
-        available_output_types = ["json", "msgpack"]
+        available_output_types = ["json", "msgpack", "apache-arrow"]
         available_output_type_labels = available_output_types.join(", ")
         parser.on("--output-type=TYPE", available_output_types,
                   "Use TYPE as the output type",
@@ -97,7 +103,7 @@ module Grntest
                   "(#{tester.testee})") do |testee|
           tester.testee = testee
           if tester.testee == "groonga-httpd"
-            tester.interface = :http
+            tester.interface = "http"
           end
         end
 
@@ -294,6 +300,7 @@ module Grntest
     attr_accessor :groonga, :groonga_httpd, :groonga_suggest_create_dataset
     attr_accessor :interface
     attr_writer :use_http_post
+    attr_writer :use_http_chunked
     attr_accessor :input_type
     attr_accessor :output_type
     attr_accessor :testee
@@ -321,8 +328,9 @@ module Grntest
       unless command_exist?(@groonga_suggest_create_dataset)
         @groonga_suggest_create_dataset = nil
       end
-      @interface = :stdio
+      @interface = "stdio"
       @use_http_post = false
+      @use_http_chunked = false
       @input_type = "json"
       @output_type = "json"
       @testee = "groonga"
@@ -374,6 +382,10 @@ module Grntest
       @use_http_post
     end
 
+    def use_http_chunked?
+      @use_http_chunked
+    end
+
     def keep_database?
       @keep_database
     end

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.3.5"
+  VERSION = "1.3.6"
 end

data/lib/grntest/worker.rb

@@ -47,6 +47,10 @@ module Grntest
       @failed_tests << name
     end
 
+    def cancel_test_failure(name)
+      @failed_tests.delete(name)
+    end
+
     def on_test_leak(name)
       @n_leaked_tests += 1
     end
@@ -179,6 +183,7 @@ module Grntest
           return true if runner.run
 
           if n < @tester.n_retries and not interruptted?
+            @result.cancel_test_failure(test_name)
             @test_suites_result.n_total_tests += 1
             next
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -138,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,21 +152,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: packnga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-rr
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -180,21 +180,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: packnga
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="