From 610a024097b870afb7ae8c1b9393647e938bea83 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 6 Sep 2013 22:14:38 +0000
Subject: test/player_integration: thread-safety fix

Process.waitall prevents test cases from using multiple threads
(we're already using multiple processes).  We may use
parallelize_me! from minitest in the future.
---
 test/player_integration.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'test/player_integration.rb')

diff --git a/test/player_integration.rb b/test/player_integration.rb
index 5ca3e43..57ee3af 100644
--- a/test/player_integration.rb
+++ b/test/player_integration.rb
@@ -74,8 +74,10 @@ module PlayerIntegration
   end
 
   def teardown
-    Process.kill(:TERM, @pid) if @pid
-    Process.waitall
+    if @pid
+      Process.kill(:TERM, @pid)
+      Process.waitpid2(@pid)
+    end
     refute File.exist?(@sock_path)
     @state_tmp.close!
     @out.close! if @out
-- 
cgit v1.2.3-24-ge0c7