Merge Psych-5.0.1

1 files changed, 8 insertions, 0 deletions

diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb
index 3604e7c985..e087e319a5 100644
--- a/test/psych/test_parser.rb
+++ b/test/psych/test_parser.rb
@@ -85,6 +85,8 @@ module Psych
 
     def test_line_numbers
       assert_equal 0, @parser.mark.line
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
+
       @parser.parse "---\n- hello\n- world"
       line_calls = @handler.marks.map(&:line).zip(@handler.calls.map(&:first))
       assert_equal [
@@ -110,6 +112,8 @@ module Psych
 
     def test_column_numbers
       assert_equal 0, @parser.mark.column
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
+
       @parser.parse "---\n- hello\n- world"
       col_calls = @handler.marks.map(&:column).zip(@handler.calls.map(&:first))
       assert_equal [
@@ -135,6 +139,8 @@ module Psych
 
     def test_index_numbers
       assert_equal 0, @parser.mark.index
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
+
       @parser.parse "---\n- hello\n- world"
       idx_calls = @handler.marks.map(&:index).zip(@handler.calls.map(&:first))
       assert_equal [
@@ -352,6 +358,8 @@ module Psych
     end
 
     def test_event_location
+      pend "Failing on JRuby" if RUBY_PLATFORM =~ /java/
+
       @parser.parse "foo:\n" \
                     "  barbaz: [1, 2]"