jruby · Feb 22, 2016 · Feb 22, 2016 · Feb 22, 2016 · Feb 22, 2016 · Feb 22, 2016
Showing with 12 additions and 2 deletions.

+1 −1 lib/pom.rb

+1 −1 lib/pom.xml

+1 −0 test/mri/excludes/Psych/TestEncoding.rb

+3 −0 test/mri/excludes/TestMethod.rb

+4 −0 test/mri/excludes/TestProcess.rb

+2 −0 test/mri/psych/test_emitter.rb
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -17,7 +17,7 @@ def initialize( name, version, default_spec = true )
    ImportedGem.new( 'minitest', '${minitest.version}' ),
    ImportedGem.new( 'test-unit', '${test-unit.version}' ),
    ImportedGem.new( 'power_assert', '${power_assert.version}' ),
-   ImportedGem.new( 'psych', '2.0.15' ),
+   ImportedGem.new( 'psych', '2.0.17' ),
    ImportedGem.new( 'json', '${json.version}' ),
    ImportedGem.new( 'jar-dependencies', '${jar-dependencies.version}' ),
    ImportedGem.new( 'racc', '${racc.version}'),

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -125,7 +125,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>psych</artifactId>
-      <version>2.0.15</version>
+      <version>2.0.17</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>

diff --git a/test/mri/excludes/Psych/TestEncoding.rb b/test/mri/excludes/Psych/TestEncoding.rb
@@ -1,4 +1,5 @@
 exclude :test_doc_tag_encoding, "encoding support not implemented"
+exclude :test_dump_non_ascii_string_to_file, "missing fix, see tenderlove/psych#272"
 exclude :test_emit_alias, "encoding support not implemented"
 exclude :test_start_mapping, "encoding support not implemented"
 exclude :test_start_sequence, "encoding support not implemented"

diff --git a/test/mri/excludes/TestMethod.rb b/test/mri/excludes/TestMethod.rb
@@ -3,11 +3,14 @@
 exclude :test_body, "fails due RubyVM constant"
 exclude :test_callee, "needs investigation"
 exclude :test_clone, "needs investigation"
+exclude :test_define_method_in_private_scope, "scope changes in define_method methods?"
 exclude :test_define_method_visibility, "needs investigation"
+exclude :test_define_method_with_symbol, "scope changes in define_method methods?"
 exclude :test_eq, "needs investigation"
 exclude :test_hash, "needs investigation"
 exclude :test_inspect, "needs investigation"
 exclude :test_orphan_callee, "needs investigation"
+exclude :test_singleton_define_method_in_private_scope, "scope changes in define_method methods?"
 exclude :test_singleton_method, "needs investigation"
 exclude :test_super_in_proc_from_define_method, "NoMethodError expected but nothing was raised"
 exclude :test_super_method_removed, "finds super method when super method has been undef (#2155)"

diff --git a/test/mri/excludes/TestProcess.rb b/test/mri/excludes/TestProcess.rb
@@ -21,8 +21,11 @@
 exclude :test_exec_fd_3_redirect, "requires fork"
 #exclude :test_execopts_gid, "doesn't really pass but test seems OK due throwing NotImplementedError"
 exclude :test_execopts_open_chdir, "needs investigation"
+exclude :test_execopts_open_failure, "may depend on error handling after fork, not possible with posix_spawn"
 exclude :test_execopts_pgroup, "#<TypeError: no implicit conversion of false into Integer>"
 exclude :test_execopts_popen, "needs investigation"
+exclude :test_execopts_popen_extra_fdsh, "appears chdir is screwing up the resulting command line"
+exclude :test_execopts_popen_stdio, "appears chdir is causing ruby to be interpreted as shell"
 exclude :test_execopts_preserve_env_on_exec_failure, "needs investigation"
 exclude :test_execopts_redirect_fd, "Errno::ENOENT: No such file or directory - out"
 exclude :test_execopts_redirect_dup2_child, "Errno::ENOENT: No such file or directory - out"
@@ -43,6 +46,7 @@
 exclude :test_fd_inheritance, "unimplemented: cyclic redirects in child are not supported"
 exclude :test_gid_re_exchangeable_p, "unimplemented"
 exclude :test_gid_sid_available?, "unimplemented"
+exclude :test_kill_at_spawn_failure, "thread lifecycle at process boundaries?"
 exclude :test_no_curdir, "won't work due changed wd detection (since 1e30600bdbbf483a)"
 exclude :test_popen_cloexec, "unsupported"
 exclude :test_popen_noshell, "fails on linux (Travis)"

diff --git a/test/mri/psych/test_emitter.rb b/test/mri/psych/test_emitter.rb
@@ -93,6 +93,8 @@ def test_start_sequence_arg_error
     end
 
     def test_resizing_tags
+      @emitter.start_stream Psych::Nodes::Stream::UTF8
+
       tags = []
       version = [1,1]
       obj = Object.new