grntest 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c55e0bf4a89cc29c33e5081c6380c2652844e33a
-  data.tar.gz: 0d469e06c4bdb6b18761d40342d0d6d436f4d6fb
+SHA256:
+  metadata.gz: 59d77daf46cb62a91f7720b8d1564d5fdba3d52e711052f9fbd5766f08e68efe
+  data.tar.gz: 70994ec44ffd1616a10688c5a55bf8ad1c698762ca835188f48d1092bf02cfe4
 SHA512:
-  metadata.gz: 95563f90d0b1d93ec3568d5996a4c43a9d3617db4ead96f843b2b13f1009702c974511caee8d1638a26b90cd1fb3dc51625e39c97903d4e7120983bc8fc13f2f
-  data.tar.gz: aee7784eac1c012ee42ea39faba590f74044abbee1dee52ecf21d42008bdc38f3d698ce56eeb144d80ffebb7b62680f8288c2a4365277456483a434be2bf8458
+  metadata.gz: 305c2e818362497ae196f322aab69e67a12577715ba23ba3ac2439ae71133047c474a215fac26c074f9b464cefa8cbe8fc54007d147fbbf122a1d8abc8dd3ee8
+  data.tar.gz: 24f24e86fe847c5787ab4e87de9f1bc2e3dc632342fad62e07691c931f6fed1abf64f033457af565edc1d5916df9617a4b8f75071544ec801899b9acf7a2cbf4

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # News
 
+## 1.3.1: 2018-11-19
+
+### Improvements
+
+  * Improved HTTP related error handling.
+
+  * Added `--shutdown-wait-time` option.
+
+  * Improved shutdown process for Groonga HTTP server.
+
 ## 1.3.0: 2018-11-16
 
 ### Improvements
@@ -10,7 +20,7 @@
 
 ### Fixes
 
-* Fixed encoding error on error report.
+  * Fixed encoding error on error report.
 
 ## 1.2.9: 2018-01-18
 

data/lib/grntest/execution-context.rb

@@ -26,6 +26,7 @@ module Grntest
     attr_accessor :read_timeout
     attr_accessor :default_timeout
     attr_accessor :default_read_timeout
+    attr_accessor :shutdown_wait_timeout
     attr_writer :suppress_backtrace
     attr_writer :collect_query_log
     attr_writer :debug
@@ -46,6 +47,7 @@ module Grntest
       @read_timeout = 3
       @default_timeout = @timeout
       @default_read_timeout = @read_timeout
+      @shutdown_wait_timeout = 5
       @omitted = false
       @suppress_backtrace = true
       @collect_query_log = false

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

@@ -83,7 +83,6 @@ module Grntest
         end
 
         status = nil
-        timeout = 1
         total_sleep_time = 0
         sleep_time = 0.05
         loop do
@@ -91,7 +90,7 @@ module Grntest
           break if status
           sleep(sleep_time)
           total_sleep_time += sleep_time
-          return false if total_sleep_time > timeout
+          return false if total_sleep_time > context.shutdown_wait_timeout
         end
 
         log_error(read_all_log) unless status.success?

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

@@ -91,6 +91,14 @@ module Grntest
           raise Error.new(message)
         rescue OpenURI::HTTPError
           $!.io.read
+        rescue Net::HTTPBadResponse
+          message = "bad response from Groonga: <#{url}>: "
+          message << "#{$!.class}: #{$!.message}"
+          raise Error.new(message)
+        rescue Net::HTTPHeaderSyntaxError
+          message = "bad HTTP header syntax in Groonga response: <#{url}>: "
+          message << "#{$!.class}: #{$!.message}"
+          raise Error.new(message)
         end
       end
 

data/lib/grntest/test-runner.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2018  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
@@ -85,7 +85,6 @@ module Grntest
       @worker = worker
       @max_n_columns = MAX_N_COLUMNS
       @id = nil
-      @shutdown_wait_timeout = 5
     end
 
     def run
@@ -143,6 +142,7 @@ module Grntest
         context.read_timeout = @tester.read_timeout
         context.default_timeout = context.timeout
         context.default_read_timeout = context.read_timeout
+        context.shutdown_wait_timeout = @tester.shutdown_wait_timeout
         context.suppress_backtrace = @tester.suppress_backtrace?
         context.debug = @tester.debug?
         run_groonga(context) do |executor|
@@ -379,16 +379,24 @@ call chdir("#{context.temporary_directory_path}")
           end
           yield(executor)
         ensure
-          pid = nil if executor.shutdown(pid)
-          if wait_groonga_http_shutdown(pid_file_path)
+          if executor.shutdown(pid)
+            pid = nil
+          else
+            wait_groonga_http_shutdown(pid_file_path)
             pid = nil if wait_pid(pid)
           end
         end
       ensure
-        return if pid.nil?
-        Process.kill(:TERM, pid)
-        wait_groonga_http_shutdown(pid_file_path)
-        ensure_process_finished(pid)
+        if pid
+          begin
+            Process.kill(:TERM, pid)
+          rescue SystemCallError => error
+            $stderr.puts("TERM -> #{pid}: #{error.class}: #{error}")
+          else
+            wait_groonga_http_shutdown(pid_file_path)
+            ensure_process_finished(pid)
+          end
+        end
       end
     end
 
@@ -425,21 +433,18 @@ call chdir("#{context.temporary_directory_path}")
         return true if Process.waitpid(pid, Process::WNOHANG)
         sleep(sleep_time)
         total_sleep_time += sleep_time
-        return false if total_sleep_time > @shutdown_wait_timeout
+        return false if total_sleep_time > @tester.shutdown_wait_timeout
       end
     end
 
     def wait_groonga_http_shutdown(pid_file_path)
-      return false unless pid_file_path.exist?
-
       total_sleep_time = 0
       sleep_time = 0.1
       while pid_file_path.exist?
         sleep(sleep_time)
         total_sleep_time += sleep_time
-        break if total_sleep_time > @shutdown_wait_timeout
+        break if total_sleep_time > @tester.shutdown_wait_timeout
       end
-      true
     end
 
     def groonga_http_command(host, port, pid_file_path, context, spawn_options)

data/lib/grntest/tester.rb

@@ -236,6 +236,12 @@ module Grntest
           tester.n_retries = n
         end
 
+        parser.on("--shutdown-wait-timeout=SECOND", Float,
+                  "Timeout for waiting shutdown",
+                  "(#{tester.shutdown_wait_timeout})") do |timeout|
+          tester.shutdown_wait_timeout = timeout
+        end
+
         parser.on("--version",
                   "Show version and exit") do
           puts(VERSION)
@@ -288,6 +294,7 @@ module Grntest
     attr_reader :test_patterns, :test_suite_patterns
     attr_reader :exclude_test_patterns, :exclude_test_suite_patterns
     attr_accessor :n_retries
+    attr_accessor :shutdown_wait_timeout
     def initialize
       @groonga = "groonga"
       @groonga_httpd = "groonga-httpd"
@@ -319,6 +326,7 @@ module Grntest
       @timeout = 5
       @read_timeout = 3
       @n_retries = 0
+      @shutdown_wait_timeout = 5
     end
 
     def run(*targets)

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.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -219,13 +219,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.0.beta2
 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/executors/test-base-executor.rb
 - test/executors/test-standard-io-executor.rb
-- test/run-test.rb
 - test/test-log-parser.rb