grntest 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afb75de0224879e3c0a183831ba799d6fed9b311
-  data.tar.gz: 2dae34d806dcf6e593ef6681051fe355d23dd383
+  metadata.gz: 73a811783d638c6d6acf4eeb84a0308dbda6903b
+  data.tar.gz: e29b281351b0b295150c5959f33c3f3ff4d80d1c
 SHA512:
-  metadata.gz: 438db144e528162b0535b39fc32c8cade5e3d2a3f862e028b0240b43876fcb94552b261819a13608033914d61932a34ed07a829005757cacd8d61c9c323e75a7
-  data.tar.gz: 87916adbfb3c98d226987355f34ea2cb8d87776bd09bdd36c640ac46b88448eb27a8e6014eb20fbb7344ae2d9fa94fdd2048a04a4f5aa145e50b9e713885c65c
+  metadata.gz: 6897f2f50d59801a4e3845f25e71011bd8971677858e8cea720377008e10ae7bfbd9eea5c00fe66e6b21f8b8e4ae7af56223772436601006cfa4bf2144595251
+  data.tar.gz: c480933411acfac80d1d3cac6bf2212eb78b5e58fadfaf0482b11ce61af89e94e71c10ee2766c9bb2a6783c6c07487f56a5355ef4248bfa9bbfaac3afc7835f5

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.2.2: 2016-05-18
+
+### Improvements
+
+  * Improved shutdown process on error.
+
 ## 1.2.1: 2016-05-18
 
 ### Fixes

data/lib/grntest/test-runner.rb

@@ -381,14 +381,20 @@ call chdir("#{context.temporary_directory_path}")
     def ensure_process_finished(pid)
       return if pid.nil?
 
-      n_retries = 0
-      loop do
-        finished_pid = Process.waitpid(pid, Process::WNOHANG)
-        break if finished_pid
-        n_retries += 1
-        break if n_retries > 100
-        Process.kill(:TERM, pid)
-        sleep(0.1)
+      [:TERM, :KILL].each do |signal|
+        n_retries = 0
+        loop do
+          finished_pid = Process.waitpid(pid, Process::WNOHANG)
+          return if finished_pid
+          n_retries += 1
+          return if n_retries > 100
+          begin
+            Process.kill(signal, pid)
+          rescue SystemCallError
+            $stderr.puts("#{signal} -> #{pid}: #{$!.class}: #{$!}")
+          end
+          sleep(0.1)
+        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.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Kouhei Sutou