summaryrefslogtreecommitdiff
path: root/test/lib/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-12 15:02:30 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-12 15:02:30 +0000
commita9c84dc9919bd0ceb0a6e8a5b4d1d5325c4fbcb8 (patch)
tree7a3f09d082faa0d9fe146311346eb263ece7a860 /test/lib/test
parent7ed75492cfb3598a1b2b8c88eabed1de0b0dff8f (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_4@57914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/lib/test')
-rw-r--r--test/lib/test/unit/parallel.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/lib/test/unit/parallel.rb b/test/lib/test/unit/parallel.rb
index 1e12d18457..a0d6a45a51 100644
--- a/test/lib/test/unit/parallel.rb
+++ b/test/lib/test/unit/parallel.rb
@@ -152,8 +152,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: