From 80bedec6c25c82f2b37ecab5bab84576df52559c Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 5 Dec 2015 08:33:38 +0000
Subject: assertions.rb: fallback encoding error

* test/lib/test/unit/assertions.rb (message): fallback when
  outputs from different encoding commands mixed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/lib/test/unit/assertions.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'test/lib')

diff --git a/test/lib/test/unit/assertions.rb b/test/lib/test/unit/assertions.rb
index ca15bef720..936dcbf9f8 100644
--- a/test/lib/test/unit/assertions.rb
+++ b/test/lib/test/unit/assertions.rb
@@ -490,7 +490,11 @@ EOT
             if 1 < ary.length
               ary[0...-1] = ary[0...-1].map {|str| str.sub(/(?<!\.)\z/, '.') }
             end
-            ary.join("\n")
+            begin
+              ary.join("\n")
+            rescue Encoding::CompatibilityError
+              ary.map(&:b).join("\n")
+            end
           end
         else
           super
-- 
cgit v1.2.3