Merge Psych-5.0.1

1 files changed, 7 insertions, 0 deletions

diff --git a/test/psych/test_encoding.rb b/test/psych/test_encoding.rb
index e5831c9045..7d33814805 100644
--- a/test/psych/test_encoding.rb
+++ b/test/psych/test_encoding.rb
@@ -119,6 +119,8 @@ module Psych
     end
 
     def test_emit_alias
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
+
       @emitter.start_stream Psych::Parser::UTF8
       @emitter.start_document [], [], true
       e = assert_raise(RuntimeError) do
@@ -151,6 +153,7 @@ module Psych
       @emitter.end_mapping
       @emitter.end_document false
       @emitter.end_stream
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
 
       @parser.parse @buffer.string
       assert_encodings @utf8, @handler.strings
@@ -170,6 +173,7 @@ module Psych
       @emitter.end_sequence
       @emitter.end_document false
       @emitter.end_stream
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
 
       @parser.parse @buffer.string
       assert_encodings @utf8, @handler.strings
@@ -187,6 +191,7 @@ module Psych
       @emitter.scalar 'foo', nil, nil, true, false, Nodes::Scalar::ANY
       @emitter.end_document false
       @emitter.end_stream
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
 
       @parser.parse @buffer.string
       assert_encodings @utf8, @handler.strings
@@ -263,6 +268,8 @@ module Psych
     end
 
     def test_dump_non_ascii_string_to_file
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
+
       Tempfile.create(['utf8', 'yml'], :encoding => 'UTF-8') do |t|
         h = {'one' => 'いち'}
         Psych.dump(h, t)