grntest 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61393e0186647b014a4b66f3410d5f419a00438
-  data.tar.gz: 6a1504fa74e60166dd9846e0b620f9d98b701f6f
+  metadata.gz: c1eaa6113280fa4fd998676aefad9f96fe7dd6c1
+  data.tar.gz: 90996c0c6d5f98167cbf46a60365837de1755e67
 SHA512:
-  metadata.gz: c38aebc58a3d4b0d3140ab69fbc3ab2ce433b8f2db3f6248fedc27773c1bba0b3dcc7e5b0cd47d9ba4f0763f4095dd3eab74b95ec46a66362b6065add32fde55
-  data.tar.gz: 5190437778add09f73751040dc418f9b219d209ba79d81ddb67dc81152398a250d04380e109ccaac158f5439fb3380054a5bdcf183b3d2e02550bc3b8599b906
+  metadata.gz: dcf4cab75f97aec997435e31b845caba4f051e8b81b60d61dddcb0ca78d5af10723bc1dbd5cbfd9404b8dbafe3a39489b859df070e59ca38d832bb7301d4e71b
+  data.tar.gz: 4fa7f1859c11aa24e095e43d1ff15ddccc5f595b72971fcf35508dcde4b86a466069675a892f61b1a9fc2a58fc6f74ecbcf595e295e54e103ebcb453850c989b

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.2.0: 2016-05-18
+
+### Improvements
+
+  * Improved shutdown on `--interface stdio`.
+
 ## 1.1.9: 2016-05-17
 
 ### Improvements

data/lib/grntest/test-runner.rb

@@ -39,6 +39,7 @@ module Grntest
       @expected = nil
       @n_leaked_objects = 0
       @omitted = false
+      @shutdown_wait_timeout = 5
     end
 
     def status
@@ -228,7 +229,10 @@ module Grntest
           end
         end
       ensure
-        Process.waitpid(pid) if pid
+        if pid
+          pid = nil if wait_pid(pid)
+          ensure_process_finished(pid)
+        end
       end
     end
 
@@ -339,7 +343,6 @@ call chdir("#{context.temporary_directory_path}")
       command_line = groonga_http_command(host, port, pid_file_path, context,
                                           spawn_options)
       pid = nil
-      shutdown_wait_timeout = 5
       options = {
         :read_timeout => @tester.timeout,
       }
@@ -363,14 +366,14 @@ call chdir("#{context.temporary_directory_path}")
           yield(executor)
         ensure
           pid = nil if executor.shutdown(pid)
-          if wait_groonga_http_shutdown(pid_file_path, shutdown_wait_timeout)
-            pid = nil if wait_pid(pid, shutdown_wait_timeout)
+          if 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, shutdown_wait_timeout)
+        wait_groonga_http_shutdown(pid_file_path)
         ensure_process_finished(pid)
       end
     end
@@ -389,18 +392,18 @@ call chdir("#{context.temporary_directory_path}")
       end
     end
 
-    def wait_pid(pid, timeout)
+    def wait_pid(pid)
       total_sleep_time = 0
       sleep_time = 0.1
       loop do
         return true if Process.waitpid(pid, Process::WNOHANG)
         sleep(sleep_time)
         total_sleep_time += sleep_time
-        return false if total_sleep_time > timeout
+        return false if total_sleep_time > @shutdown_wait_timeout
       end
     end
 
-    def wait_groonga_http_shutdown(pid_file_path, timeout)
+    def wait_groonga_http_shutdown(pid_file_path)
       return false unless pid_file_path.exist?
 
       total_sleep_time = 0
@@ -408,7 +411,7 @@ call chdir("#{context.temporary_directory_path}")
       while pid_file_path.exist?
         sleep(sleep_time)
         total_sleep_time += sleep_time
-        break if total_sleep_time > timeout
+        break if total_sleep_time > @shutdown_wait_timeout
       end
       true
     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.1.9"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json