grntest 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73a811783d638c6d6acf4eeb84a0308dbda6903b
-  data.tar.gz: e29b281351b0b295150c5959f33c3f3ff4d80d1c
+  metadata.gz: 1cd44715730b214bd92dd2c6d77b236f3a9d97c4
+  data.tar.gz: 63dc616b531e5613bf7dfe1ec6c2e6fe04d8fe9c
 SHA512:
-  metadata.gz: 6897f2f50d59801a4e3845f25e71011bd8971677858e8cea720377008e10ae7bfbd9eea5c00fe66e6b21f8b8e4ae7af56223772436601006cfa4bf2144595251
-  data.tar.gz: c480933411acfac80d1d3cac6bf2212eb78b5e58fadfaf0482b11ce61af89e94e71c10ee2766c9bb2a6783c6c07487f56a5355ef4248bfa9bbfaac3afc7835f5
+  metadata.gz: 898f8874c0efb5dc04159ac2224a81688dc88a0c5c081933a5bfb2d8675273f4ff63e27f53dcaa275d68c9b7f6ef16aae226669cd7db49f12ab58ef49a092fe0
+  data.tar.gz: 955f66d7a2a2333275ded2148ae49d64853a5fe66ccfe55ea3d98ae580ad97116e673b240e062d0d86ba30a9ccafbd062df8ab2cd6f06d152a563eb5030b16e3

data/doc/text/news.md

@@ -1,5 +1,29 @@
 # News
 
+## 1.2.3: 2016-07-19
+
+### Improvements
+
+  * Disabled read time on GDB mode.
+
+  * Supported object literal based response introduced by command version 3.
+
+  * Suppressed omissions from report.
+
+  * Added `generate-series` directive.
+
+  * Added `read-timeout` directive.
+
+  * Added `long-read-timeout` directive.
+
+  * Removed `long-timeout` directive. Use `long-read-timeout` directive instead.
+
+  * Supported `#{base_directory}` expansion in variable value.
+
+  * Supported variable expansion in environment variable value.
+
+  * Supported normalizing plugin path in `object_list`.
+
 ## 1.2.2: 2016-05-18
 
 ### Improvements

data/lib/grntest/execution-context.rb

@@ -22,6 +22,8 @@ module Grntest
     attr_accessor :output_type
     attr_accessor :on_error
     attr_accessor :abort_tag
+    attr_accessor :timeout
+    attr_accessor :default_timeout
     attr_writer :collect_query_log
     attr_writer :debug
     def initialize
@@ -37,6 +39,8 @@ module Grntest
       @query_log = nil
       @on_error = :default
       @abort_tag = nil
+      @timeout = 0
+      @default_timeout = 0
       @omitted = false
       @collect_query_log = false
       @debug = false

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

@@ -24,6 +24,8 @@ require "grntest/log-parser"
 require "grntest/query-log-parser"
 require "grntest/execution-context"
 require "grntest/response-parser"
+require "grntest/template-evaluator"
+require "grntest/variable-expander"
 
 module Grntest
   module Executors
@@ -39,8 +41,8 @@ module Grntest
         @pending_load_command = nil
         @current_command_name = nil
         @output_type = nil
-        @timeout = default_timeout
-        @long_timeout = default_long_timeout
+        @read_timeout = default_read_timeout
+        @long_read_timeout = default_long_read_timeout
         @context = context
         @custom_important_log_levels = []
       end
@@ -75,7 +77,9 @@ module Grntest
 
       def shutdown(pid)
         begin
-          send_command(command("shutdown"))
+          Timeout.timeout(@context.timeout) do
+            send_command(command("shutdown"))
+          end
         rescue
           return false
         end
@@ -122,7 +126,7 @@ module Grntest
         parser.on_comment do |comment|
           if /\A@/ =~ comment
             directive_content = $POSTMATCH
-            execute_directive("\##{comment}", directive_content)
+            execute_directive(parser, "\##{comment}", directive_content)
           end
         end
         parser
@@ -157,14 +161,8 @@ module Grntest
       end
 
       def expand_variables(string)
-        string.gsub(/\#{(.+?)}/) do |matched|
-          case $1
-          when "db_path"
-            @context.db_path.to_s
-          else
-            matched
-          end
-        end
+        expander = VariableExpander.new(@context)
+        expander.expand(string)
       end
 
       def execute_directive_copy_path(line, content, options)
@@ -184,17 +182,18 @@ module Grntest
         FileUtils.cp_r(source.to_s, destination.to_s)
       end
 
-      def execute_directive_timeout(line, content, options)
-        timeout, = options
+      def timeout_value(key, line, input, default)
+        new_value = nil
+
         invalid_value_p = false
-        case timeout
+        case input
         when "default"
-          @timeout = default_timeout
+          new_value = default
         when nil
           invalid_value_p = true
         else
           begin
-            @timeout = Float(timeout)
+            new_value = Float(input)
           rescue ArgumentError
             invalid_value_p = true
           end
@@ -202,32 +201,39 @@ module Grntest
 
         if invalid_value_p
           log_input(line)
-          message = "timeout must be number or 'default': <#{timeout}>"
-          log_error("#|e| [timeout] #{message}")
+          message = "#{key} must be number or 'default': <#{input}>"
+          log_error("#|e| [#{key}] #{message}")
+          nil
+        else
+          new_value
         end
       end
 
-      def execute_directive_long_timeout(line, content, options)
-        long_timeout, = options
-        invalid_value_p = false
-        case long_timeout
-        when "default"
-          @long_timeout = default_long_timeout
-        when nil
-          invalid_value_p = true
-        else
-          begin
-            @long_timeout = Float(long_timeout)
-          rescue ArgumentError
-            invalid_value_p = true
-          end
-        end
+      def execute_directive_timeout(line, content, options)
+        timeout, = options
+        new_value = timeout_value("timeout",
+                                  line,
+                                  timeout,
+                                  @context.default_timeout)
+        @context.timeout = new_value unless new_value.nil?
+      end
 
-        if invalid_value_p
-          log_input(line)
-          message = "long-timeout must be number or 'default': <#{long_timeout}>"
-          log_error("#|e| [long-timeout] #{message}")
-        end
+      def execute_directive_read_timeout(line, content, options)
+        timeout, = options
+        new_value = timeout_value("read-timeout",
+                                  line,
+                                  timeout,
+                                  default_read_timeout)
+        @read_timeout = new_value unless new_value.nil?
+      end
+
+      def execute_directive_long_read_timeout(line, content, options)
+        timeout, = options
+        new_value = timeout_value("long-read-timeout",
+                                  line,
+                                  timeout,
+                                  default_long_read_timeout)
+        @long_read_timeout = new_value unless new_value.nil?
       end
 
       def execute_directive_on_error(line, content, options)
@@ -286,7 +292,27 @@ module Grntest
         @context.collect_query_log = (options[0] == "true")
       end
 
-      def execute_directive(line, content)
+      def execute_directive_generate_series(parser, line, content, options)
+        start, stop, table, template, = options
+        evaluator = TemplateEvaluator.new(template)
+        parser << "load --table #{table}\n"
+        parser << "["
+        first_record = true
+        Integer(start).step(Integer(stop)) do |i|
+          record = ""
+          if first_record
+            first_record = false
+          else
+            record << ","
+          end
+          record << "\n"
+          record << evaluator.evaluate(i).to_json
+          parser << record
+        end
+        parser << "\n]\n"
+      end
+
+      def execute_directive(parser, line, content)
         command, *options = Shellwords.split(content)
         case command
         when "disable-logging"
@@ -301,8 +327,10 @@ module Grntest
           execute_directive_copy_path(line, content, options)
         when "timeout"
           execute_directive_timeout(line, content, options)
-        when "long-timeout"
-          execute_directive_long_timeout(line, content, options)
+        when "read-timeout"
+          execute_directive_read_timeout(line, content, options)
+        when "long-read-timeout"
+          execute_directive_long_read_timeout(line, content, options)
         when "on-error"
           execute_directive_on_error(line, content, options)
         when "omit"
@@ -315,6 +343,8 @@ module Grntest
           execute_directive_sleep(line, content, options)
         when "collect-query-log"
           execute_directive_collect_query_log(line, content, options)
+        when "generate-series"
+          execute_directive_generate_series(parser, line, content, options)
         else
           log_input(line)
           log_error("#|e| unknown directive: <#{command}>")
@@ -360,8 +390,15 @@ module Grntest
       def execute_command(command)
         extract_command_info(command)
         log_input("#{command.original_source}\n")
+        timeout = @context.timeout
+        response = nil
         begin
-          response = send_command(command)
+          Timeout.timeout(timeout) do
+            response = send_command(command)
+          end
+        rescue Timeout::Error
+          log_error("# error: timeout (#{timeout}s)")
+          @context.error
         rescue => error
           log_error("# error: #{error.class}: #{error.message}")
           error.backtrace.each do |line|
@@ -399,7 +436,7 @@ module Grntest
 
       def read_all_readable_content(output, options={})
         content = ""
-        first_timeout = options[:first_timeout] || @timeout
+        first_timeout = options[:first_timeout] || @read_timeout
         timeout = first_timeout
         while IO.select([output], [], [], timeout)
           break if output.eof?
@@ -499,11 +536,11 @@ module Grntest
         output
       end
 
-      def default_timeout
+      def default_read_timeout
         3
       end
 
-      def default_long_timeout
+      def default_long_read_timeout
         180
       end
     end

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

@@ -22,11 +22,10 @@ require "grntest/executors/base-executor"
 module Grntest
   module Executors
     class HTTPExecutor < BaseExecutor
-      def initialize(host, port, context, options={})
+      def initialize(host, port, context)
         super(context)
         @host = host
         @port = port
-        @read_timeout = options[:read_timeout] || 3
       end
 
       def send_command(command)
@@ -75,7 +74,7 @@ module Grntest
         request.content_type = "application/json; charset=UTF-8"
         request.body = body
         response = Net::HTTP.start(@host, @port) do |http|
-          http.read_timeout = @read_timeout
+          http.read_timeout = @context.timeout
           http.request(request)
         end
         normalize_response_data(command, response.body)
@@ -84,7 +83,7 @@ module Grntest
       def send_normal_command(command)
         url = "http://#{@host}:#{@port}#{command.to_uri_format}"
         begin
-          open(url, :read_timeout => @read_timeout) do |response|
+          open(url, :read_timeout => @context.timeout) do |response|
             normalize_response_data(command, response.read)
           end
         rescue SystemCallError

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

@@ -57,7 +57,7 @@ module Grntest
       def read_output(command)
         options = {}
         if may_slow_command?(command)
-          options[:first_timeout] = @long_timeout
+          options[:first_timeout] = @long_read_timeout
         end
         read_all_readable_content(@output, options)
       end

data/lib/grntest/reporters/inplace-reporter.rb

@@ -67,6 +67,9 @@ module Grntest
         end
       end
 
+      def on_test_omission_suppressed(worker, result)
+      end
+
       def on_test_no_check(worker, result)
         redraw do
           report_test(worker, result)

data/lib/grntest/reporters/mark-reporter.rb

@@ -73,6 +73,12 @@ module Grntest
         end
       end
 
+      def on_test_omission_suppressed(worker, result)
+        synchronize do
+          report_test_result_mark("O", result)
+        end
+      end
+
       def on_test_no_check(worker, result)
         synchronize do
           report_test_result_mark("N", result)

data/lib/grntest/reporters/stream-reporter.rb

@@ -63,6 +63,10 @@ module Grntest
         report_actual(result)
       end
 
+      def on_test_omission_suppressed(worker, result)
+        report_test_result(result, worker.status)
+      end
+
       def on_test_no_check(worker, result)
         report_test_result(result, worker.status)
         report_actual(result)

data/lib/grntest/template-evaluator.rb

@@ -0,0 +1,26 @@
+# Copyright (C) 2016  Kouhei Sutou <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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Grntest
+  class TemplateEvaluator
+    def initialize(template)
+      @template = template
+    end
+
+    def evaluate(i)
+      eval(@template)
+    end
+  end
+end

data/lib/grntest/test-runner.rb

@@ -136,16 +136,12 @@ module Grntest
         context.groonga_suggest_create_dataset =
           @tester.groonga_suggest_create_dataset
         context.output_type = @tester.output_type
+        context.timeout = @tester.timeout
+        context.timeout = 0 if @tester.gdb
+        context.default_timeout = context.timeout
         context.debug = @tester.debug?
         run_groonga(context) do |executor|
-          begin
-            Timeout.timeout(@tester.timeout) do
-              executor.execute(test_script_path)
-            end
-          rescue Timeout::Error
-            message = "# error: timeout (#{@tester.timeout}s)"
-            context.result << [:error, message, {}]
-          end
+          executor.execute(test_script_path)
         end
         check_memory_leak(context)
         result.omitted = context.omitted?
@@ -198,7 +194,7 @@ module Grntest
           groonga_input = input_write
           groonga_output = output_read
 
-          env = extract_custom_env
+          env = extract_custom_env(context)
           spawn_options = {}
           command_line = groonga_command_line(context, spawn_options)
           if Platform.windows?
@@ -338,21 +334,16 @@ call chdir("#{context.temporary_directory_path}")
       port = 50041 + @worker.id
       pid_file_path = context.temporary_directory_path + "groonga.pid"
 
-      env = extract_custom_env
+      env = extract_custom_env(context)
       spawn_options = {}
       command_line = groonga_http_command(host, port, pid_file_path, context,
                                           spawn_options)
       pid = nil
-      options = {
-        :read_timeout => @tester.timeout,
-      }
-      if @tester.gdb
-        options[:read_timeout] = 60 * 10
-      end
       begin
         pid = Process.spawn(env, *command_line, spawn_options)
+        executor = nil
         begin
-          executor = Executors::HTTPExecutor.new(host, port, context, options)
+          executor = Executors::HTTPExecutor.new(host, port, context)
           begin
             executor.ensure_groonga_ready
           rescue
@@ -381,6 +372,11 @@ call chdir("#{context.temporary_directory_path}")
     def ensure_process_finished(pid)
       return if pid.nil?
 
+      if @tester.gdb
+        Process.waitpid(pid)
+        return
+      end
+
       [:TERM, :KILL].each do |signal|
         n_retries = 0
         loop do
@@ -392,6 +388,7 @@ call chdir("#{context.temporary_directory_path}")
             Process.kill(signal, pid)
           rescue SystemCallError
             $stderr.puts("#{signal} -> #{pid}: #{$!.class}: #{$!}")
+            return
           end
           sleep(0.1)
         end
@@ -463,7 +460,7 @@ events {
 }
         GLOBAL
 
-        env = ENV.to_hash.merge(extract_custom_env)
+        env = ENV.to_hash.merge(extract_custom_env(context))
         env.each do |key, value|
           next unless key.start_with?("GRN_")
           config_file.puts(<<-ENV)
@@ -549,35 +546,7 @@ http {
       type = options[:type]
       case type
       when "json", "msgpack"
-        status = nil
-        values = nil
-        content = content.chomp
-        if type == "json" and /\A([^(]+\()(.+)(\);)\z/ =~ content
-          jsonp = true
-          jsonp_start = $1
-          content = $2
-          jsonp_end = $3
-        else
-          jsonp = false
-        end
-        begin
-          status, *values = ResponseParser.parse(content, type)
-        rescue ParseError
-          return $!.message
-        end
-        normalized_status = normalize_status(status)
-        normalized_values = normalize_values(values)
-        normalized_output_content = [normalized_status, *normalized_values]
-        normalized_output = JSON.generate(normalized_output_content)
-        if normalized_output.bytesize > @max_n_columns
-          normalized_output = JSON.pretty_generate(normalized_output_content)
-        end
-        normalized_raw_content = normalize_raw_content(normalized_output)
-        if jsonp
-          "#{jsonp_start}#{normalized_raw_content.chomp}#{jsonp_end}\n"
-        else
-          normalized_raw_content
-        end
+        normalize_output_structured(type, content, options)
       when "xml"
         normalized_xml = normalize_output_xml(content, options)
         normalize_raw_content(normalized_xml)
@@ -588,35 +557,108 @@ http {
       end
     end
 
+    def normalize_output_structured(type, content, options)
+      response = nil
+      content = content.chomp
+      if type == "json" and /\A([^(]+\()(.+)(\);)\z/ =~ content
+        jsonp = true
+        jsonp_start = $1
+        content = $2
+        jsonp_end = $3
+      else
+        jsonp = false
+      end
+      begin
+        response = ResponseParser.parse(content, type)
+      rescue ParseError
+        return $!.message
+      end
+
+      if response.is_a?(Hash)
+        normalized_response =
+          response.merge({
+                           "header" => normalize_header(response["header"]),
+                           "body"   => normalize_body(response["body"]),
+                         })
+      else
+        header, *values = response
+        normalized_header = normalize_header(header)
+        normalized_values = values.collect do |value|
+          normalize_body(value)
+        end
+        normalized_response = [normalized_header, *normalized_values]
+      end
+      normalized_output = JSON.generate(normalized_response)
+      if normalized_output.bytesize > @max_n_columns
+        normalized_output = JSON.pretty_generate(normalized_response)
+      end
+      normalized_raw_content = normalize_raw_content(normalized_output)
+
+      if jsonp
+        "#{jsonp_start}#{normalized_raw_content.chomp}#{jsonp_end}\n"
+      else
+        normalized_raw_content
+      end
+    end
+
     def normalize_output_xml(content, options)
       content.sub(/^<RESULT .+?>/) do |result|
         result.gsub(/( (?:UP|ELAPSED))="\d+\.\d+(?:e[+-]?\d+)?"/, '\1="0.0"')
       end
     end
 
-    def normalize_status(status)
-      return_code, started_time, elapsed_time, *rest = status
-      _ = started_time = elapsed_time # for suppress warnings
-      if return_code.zero?
-        [0, 0.0, 0.0]
+    def normalize_header(header)
+      if header.is_a?(Hash)
+        return_code = header["return_code"]
+        if return_code.zero?
+          header.merge({
+                         "start_time"   => 0.0,
+                         "elapsed_time" => 0.0,
+                       })
+        else
+          error = header["error"]
+          message = error["message"]
+          message = normalize_path_in_error_message(message)
+          header.merge({
+                         "start_time"   => 0.0,
+                         "elapsed_time" => 0.0,
+                         "error"        => error.merge({"message" => message})
+                       })
+        end
       else
-        message, backtrace = rest
-        _ = backtrace # for suppress warnings
-        message = normalize_path_in_error_message(message)
-        [[return_code, 0.0, 0.0], message]
+        return_code, started_time, elapsed_time, *rest = header
+        _ = started_time = elapsed_time # for suppress warnings
+        if return_code.zero?
+          [0, 0.0, 0.0]
+        else
+          message, backtrace = rest
+          _ = backtrace # for suppress warnings
+          message = normalize_path_in_error_message(message)
+          [[return_code, 0.0, 0.0], message]
+        end
       end
     end
 
-    def normalize_values(values)
-      values.collect do |value|
-        if value.is_a?(Hash) and value["exception"]
-          exception = Marshal.load(Marshal.dump(value["exception"]))
+    def normalize_body(body)
+      case body
+      when Hash
+        if body["exception"]
+          exception = Marshal.load(Marshal.dump(body["exception"]))
           message = exception["message"]
           exception["message"] = normalize_path_in_error_message(message)
-          value.merge("exception" => exception)
+          body.merge("exception" => exception)
         else
-          value
+          body.each do |key, value|
+            case value
+            when Hash
+              path = value["path"]
+              value["path"] = normalize_plugin_path(path) if path
+            end
+          end
+          body
         end
+      else
+        body
       end
     end
 
@@ -636,19 +678,24 @@ http {
       end
     end
 
+    def normalize_plugin_path(path)
+      path.gsub(/\.libs\//, "").gsub(/\.dll\z/, ".so")
+    end
+
     def test_script_path
       @worker.test_script_path
     end
 
-    def extract_custom_env
+    def extract_custom_env(context)
       return {} unless test_script_path.exist?
 
       env = {}
       test_script_path.open("r:ascii-8bit") do |script_file|
+        expander = VariableExpander.new(context)
         script_file.each_line do |line|
           case line
           when /\A\#\$([a-zA-Z_\d]+)=(.*)/
-            env[$1] = $2.strip
+            env[$1] = expander.expand($2.strip)
           end
         end
       end

data/lib/grntest/variable-expander.rb

@@ -0,0 +1,35 @@
+# Copyright (C) 2016  Kouhei Sutou <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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Grntest
+  class VariableExpander
+    def initialize(context)
+      @context = context
+    end
+
+    def expand(string)
+      string.gsub(/\#{(.+?)}/) do |matched|
+        case $1
+        when "db_path"
+          @context.db_path.to_s
+        when "base_directory"
+          @context.base_directory.to_s
+        else
+          matched
+        end
+      end
+    end
+  end
+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.2.2"
+  VERSION = "1.2.3"
 end

data/lib/grntest/worker.rb

@@ -146,7 +146,9 @@ module Grntest
     def on_test_omission(result)
       @status = "omitted"
       @result.on_test_omission
-      unless @tester.suppress_omit_log?
+      if @tester.suppress_omit_log?
+        @reporter.on_test_omission_suppressed(self, result)
+      else
         @reporter.on_test_omission(self, result)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -188,9 +188,11 @@ files:
 - lib/grntest/reporters/mark-reporter.rb
 - lib/grntest/reporters/stream-reporter.rb
 - lib/grntest/response-parser.rb
+- lib/grntest/template-evaluator.rb
 - lib/grntest/test-runner.rb
 - lib/grntest/test-suites-runner.rb
 - lib/grntest/tester.rb
+- lib/grntest/variable-expander.rb
 - lib/grntest/version.rb
 - lib/grntest/worker.rb
 - test/executors/test-base-executor.rb