diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 16:13:11 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 16:13:11 +0000 |
| commit | 2d5eca7f505b852d6ab50a5c7aa4c05f601a18b5 (patch) | |
| tree | 6d3443d5cb32489a47c3ca1cbf1579c4c540180b /test | |
| parent | a48d15477e7cec8b9d497f36b9cbdff8f75142f3 (diff) | |
merge revision(s) 57589: [Backport #13205]
parallel.rb: fix intervention
* test/lib/test/unit/parallel.rb (_report): send a response and a
newline atomically, to get rid of intervention with "p" which
runs in a separate thread.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/test/unit/parallel.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/lib/test/unit/parallel.rb b/test/lib/test/unit/parallel.rb index ea809f28ae..b0347d720e 100644 --- a/test/lib/test/unit/parallel.rb +++ b/test/lib/test/unit/parallel.rb @@ -151,8 +151,7 @@ module Test end def _report(res, *args) # :nodoc: - res = "#{res} #{args.pack("m0")}" unless args.empty? - @stdout.puts(res) + @stdout.write(args.empty? ? "#{res}\n" : "#{res} #{args.pack("m0")}\n") end def puke(klass, meth, e) # :nodoc: |