diff options
| -rw-r--r-- | test/lib/test/unit.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb index ed32e48f86..c6983d0a6a 100644 --- a/test/lib/test/unit.rb +++ b/test/lib/test/unit.rb @@ -292,8 +292,11 @@ module Test def flush_job_tokens if @jobserver - @jobserver[1] << @job_tokens - @job_tokens.clear + r, w = @jobserver.shift(2) + @jobserver = nil + w << @job_tokens.slice!(0..-1) + r.close + w.close end end @@ -317,8 +320,8 @@ module Test return unless @options[:parallel] return if @interrupt worker.close - if @jobserver and !@job_tokens.empty? - @jobserver[1] << @job_tokens.slice!(0) + if @jobserver and (token = @job_tokens.slice!(0)) + @jobserver[1] << token end @workers.delete(worker) @dead_workers << worker |