grntest 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cd44715730b214bd92dd2c6d77b236f3a9d97c4
-  data.tar.gz: 63dc616b531e5613bf7dfe1ec6c2e6fe04d8fe9c
+  metadata.gz: 915bd62815178dc7740a1bf25e0f29483421399e
+  data.tar.gz: '02896dee4bbe5117a6fa3acc39c5de14c6243538'
 SHA512:
-  metadata.gz: 898f8874c0efb5dc04159ac2224a81688dc88a0c5c081933a5bfb2d8675273f4ff63e27f53dcaa275d68c9b7f6ef16aae226669cd7db49f12ab58ef49a092fe0
-  data.tar.gz: 955f66d7a2a2333275ded2148ae49d64853a5fe66ccfe55ea3d98ae580ad97116e673b240e062d0d86ba30a9ccafbd062df8ab2cd6f06d152a563eb5030b16e3
+  metadata.gz: e93ddd16e4f5397f2a9dd634967234b57459fc848352fb5f2e12730c789676c5ae49909dee17defd181c55998509fa153eb05c1f8ea964129eeeb5f645fff8e0
+  data.tar.gz: b79b86bff0a082bc8f949f1041db225cb4b8733d8578675d565e7733bccb9f5a722fbc3f241a7226782149d5f8cfddef6a3ea0e22544685de56ca696b13edd49

data/doc/text/news.md

@@ -1,5 +1,22 @@
 # News
 
+## 1.2.4: 2017-03-27
+
+### Improvements
+
+  * Supported outputting actual file even if the test detects memory
+    leaks.
+
+  * Supported unused port dynamically if static port is unavailable.
+
+  * Ignored "thread start" log messages.
+
+  * Supported log with PID.
+
+  * Supported auto chunked `load`.
+
+  * Added `--no-suppress-backtrace` option.
+
 ## 1.2.3: 2016-07-19
 
 ### Improvements

data/lib/grntest/execution-context.rb

@@ -24,6 +24,7 @@ module Grntest
     attr_accessor :abort_tag
     attr_accessor :timeout
     attr_accessor :default_timeout
+    attr_writer :suppress_backtrace
     attr_writer :collect_query_log
     attr_writer :debug
     def initialize
@@ -42,6 +43,7 @@ module Grntest
       @timeout = 0
       @default_timeout = 0
       @omitted = false
+      @suppress_backtrace = true
       @collect_query_log = false
       @debug = false
     end
@@ -50,6 +52,10 @@ module Grntest
       @logging
     end
 
+    def suppress_backtrace?
+      @suppress_backtrace or debug?
+    end
+
     def collect_query_log?
       @collect_query_log
     end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2017  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
@@ -295,21 +295,23 @@ module Grntest
       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 << ","
+        (Integer(start)..Integer(stop)).each_slice(1000) do |range|
+          parser << "load --table #{table}\n"
+          parser << "["
+          first_record = true
+          range.each do |i|
+            record = ""
+            if first_record
+              first_record = false
+            else
+              record << ","
+            end
+            record << "\n"
+            record << evaluator.evaluate(i).to_json
+            parser << record
           end
-          record << "\n"
-          record << evaluator.evaluate(i).to_json
-          parser << record
+          parser << "\n]\n"
         end
-        parser << "\n]\n"
       end
 
       def execute_directive(parser, line, content)
@@ -428,7 +430,10 @@ module Grntest
         parser = LogParser.new
         parser.parse(log) do |entry|
           next unless important_log_level?(entry.log_level)
-          next if backtrace_log_message?(entry.message)
+          if @context.suppress_backtrace?
+            next if backtrace_log_message?(entry.message)
+          end
+          next if thread_log_message?(entry.message)
           important_messages << "\#|#{entry.log_level}| #{entry.message}"
         end
         important_messages.join("\n")
@@ -458,7 +463,7 @@ module Grntest
         case message
         when /\A\//
           true
-        when /\A[a-zA-Z]:\//
+        when /\A[a-zA-Z]:[\/\\]/
           true
         when /\Agroonga\(\) \[0x[\da-f]+\]\z/
           true
@@ -471,6 +476,15 @@ module Grntest
         end
       end
 
+      def thread_log_message?(message)
+        case message
+        when /\Athread start/
+          true
+        else
+          false
+        end
+      end
+
       def error_response?(response, type)
         status = nil
         begin

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

@@ -74,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 = @context.timeout
+          http.read_timeout = read_timeout
           http.request(request)
         end
         normalize_response_data(command, response.body)
@@ -83,7 +83,7 @@ module Grntest
       def send_normal_command(command)
         url = "http://#{@host}:#{@port}#{command.to_uri_format}"
         begin
-          open(url, :read_timeout => @context.timeout) do |response|
+          open(url, :read_timeout => read_timeout) do |response|
             normalize_response_data(command, response.read)
           end
         rescue SystemCallError
@@ -101,6 +101,14 @@ module Grntest
           "#{raw_response_data}\n"
         end
       end
+
+      def read_timeout
+        if @context.timeout.zero?
+          nil
+        else
+          @context.timeout
+        end
+      end
     end
   end
 end

data/lib/grntest/log-parser.rb

@@ -29,12 +29,16 @@ module Grntest
       end
       log.each_line do |line|
         case line
-        when /\A(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+)\|([a-zA-Z])\|\s*/
+        when /\A(\d{4}-\d{2}-\d{2}\ \d{2}:\d{2}:\d{2}\.\d+)\|
+                ([a-zA-Z])\|
+                (?:\d+:)?
+                \s*/x
           emit_entry.call
           timestamp = $1
           log_level = $2
           message = $POSTMATCH
         else
+          message ||= ""
           message << line
         end
       end

data/lib/grntest/test-runner.rb

@@ -17,6 +17,7 @@ require "pathname"
 require "fileutils"
 require "tempfile"
 require "timeout"
+require "socket"
 
 require "json"
 
@@ -107,6 +108,7 @@ module Grntest
         succeeded = false
       when :leaked
         @worker.on_test_leak(result)
+        output_actual_file(result.actual) unless result.checked?
         succeeded = false
       when :omitted
         @worker.on_test_omission(result)
@@ -139,6 +141,7 @@ module Grntest
         context.timeout = @tester.timeout
         context.timeout = 0 if @tester.gdb
         context.default_timeout = context.timeout
+        context.suppress_backtrace = @tester.suppress_backtrace?
         context.debug = @tester.debug?
         run_groonga(context) do |executor|
           executor.execute(test_script_path)
@@ -329,9 +332,27 @@ call chdir("#{context.temporary_directory_path}")
       "libtool"
     end
 
+    def decide_groonga_server_port(host)
+      static_port = 50041 + @worker.id
+      10.times do
+        begin
+          TCPSocket.new(host, static_port)
+        rescue SystemCallError
+          return static_port
+        else
+          sleep(0.1)
+        end
+      end
+
+      dynamic_port = TCPServer.open(host, 0) do |server|
+        server.addr[1]
+      end
+      dynamic_port
+    end
+
     def run_groonga_http(context)
       host = "127.0.0.1"
-      port = 50041 + @worker.id
+      port = decide_groonga_server_port(host)
       pid_file_path = context.temporary_directory_path + "groonga.pid"
 
       env = extract_custom_env(context)
@@ -617,12 +638,17 @@ http {
                        })
         else
           error = header["error"]
+          normalized_values = {}
           message = error["message"]
-          message = normalize_path_in_error_message(message)
+          normalized_values["message"] = normalize_error_message(message)
+          file = error["file"]
+          if file
+            normalized_values["file"] = normalize_error_file_path(file)
+          end
           header.merge({
                          "start_time"   => 0.0,
                          "elapsed_time" => 0.0,
-                         "error"        => error.merge({"message" => message})
+                         "error"        => error.merge(normalized_values),
                        })
         end
       else
@@ -633,7 +659,7 @@ http {
         else
           message, backtrace = rest
           _ = backtrace # for suppress warnings
-          message = normalize_path_in_error_message(message)
+          message = normalize_error_message(message)
           [[return_code, 0.0, 0.0], message]
         end
       end
@@ -645,7 +671,7 @@ http {
         if body["exception"]
           exception = Marshal.load(Marshal.dump(body["exception"]))
           message = exception["message"]
-          exception["message"] = normalize_path_in_error_message(message)
+          exception["message"] = normalize_error_message(message)
           body.merge("exception" => exception)
         else
           body.each do |key, value|
@@ -663,11 +689,11 @@ http {
     end
 
     def normalize_error(content)
-      content = normalize_path_in_error_message(content)
+      content = normalize_error_message(content)
       normalize_raw_content(content)
     end
 
-    def normalize_path_in_error_message(content)
+    def normalize_error_message(content)
       case content
       when /\A(.*: fopen: failed to open mruby script file: )<(.+?)>?\z/
         pre = $1
@@ -678,6 +704,10 @@ http {
       end
     end
 
+    def normalize_error_file_path(path)
+      File.basename(path)
+    end
+
     def normalize_plugin_path(path)
       path.gsub(/\.libs\//, "").gsub(/\.dll\z/, ".so")
     end

data/lib/grntest/tester.rb

@@ -194,6 +194,12 @@ module Grntest
           tester.suppress_omit_log = boolean
         end
 
+        parser.on("--no-suppress-backtrace",
+                  "Suppress backtrace",
+                  "(#{tester.suppress_backtrace?})") do |boolean|
+          tester.suppress_backtrace = boolean
+        end
+
         parser.on("--output=OUTPUT",
                   "Output to OUTPUT",
                   "(stdout)") do |output|
@@ -264,6 +270,7 @@ module Grntest
     attr_writer :reporter, :keep_database, :use_color
     attr_writer :stop_on_failure
     attr_writer :suppress_omit_log
+    attr_writer :suppress_backtrace
     attr_writer :debug
     attr_reader :test_patterns, :test_suite_patterns
     attr_reader :exclude_test_patterns, :exclude_test_suite_patterns
@@ -286,6 +293,7 @@ module Grntest
       @use_color = nil
       @stop_on_failure = false
       @suppress_omit_log = true
+      @suppress_backtrace = true
       @debug = false
       @test_patterns = []
       @test_suite_patterns = []
@@ -336,6 +344,10 @@ module Grntest
       @suppress_omit_log
     end
 
+    def suppress_backtrace?
+      @suppress_backtrace
+    end
+
     def debug?
       @debug
     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.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -219,14 +219,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Grntest is a testing framework for Groonga. You can write a test for Groonga
   by writing Groonga commands and expected result.
 test_files:
-- test/run-test.rb
+- test/test-log-parser.rb
 - test/executors/test-base-executor.rb
 - test/executors/test-standard-io-executor.rb
-- test/test-log-parser.rb
-has_rdoc: 
+- test/run-test.rb