diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-01-19 13:28:23 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-01-19 15:01:44 +0900 |
commit | d22511fd7595ef1819baa42851d598d95b8f4d00 (patch) | |
tree | 83e823c033f5c39c314cf4379f0bac5c43adf3d4 /test | |
parent | 5646f4b67b75e7e558c994ff8cbd374e4b4bd3b5 (diff) | |
download | ruby-d22511fd7595ef1819baa42851d598d95b8f4d00.tar.gz |
Merge rubygems/rubygems HEAD.
Picked at 12aeef6ba9a3be0022be9934c1a3e4c46a03ed3a
Diffstat (limited to 'test')
-rw-r--r-- | test/rubygems/helper.rb | 12 | ||||
-rw-r--r-- | test/rubygems/test_gem_package.rb | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb index b1c6b84dc2..d97d930476 100644 --- a/test/rubygems/helper.rb +++ b/test/rubygems/helper.rb @@ -685,10 +685,10 @@ class Gem::TestCase < Test::Unit::TestCase # Load a YAML string, the psych 3 way def load_yaml(yaml) - if YAML.respond_to?(:unsafe_load) - YAML.unsafe_load(yaml) + if Psych.respond_to?(:unsafe_load) + Psych.unsafe_load(yaml) else - YAML.load(yaml) + Psych.load(yaml) end end @@ -696,10 +696,10 @@ class Gem::TestCase < Test::Unit::TestCase # Load a YAML file, the psych 3 way def load_yaml_file(file) - if YAML.respond_to?(:unsafe_load_file) - YAML.unsafe_load_file(file) + if Psych.respond_to?(:unsafe_load_file) + Psych.unsafe_load_file(file) else - YAML.load_file(file) + Psych.load_file(file) end end diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb index 48dcbee9f1..9172b7eef5 100644 --- a/test/rubygems/test_gem_package.rb +++ b/test/rubygems/test_gem_package.rb @@ -822,7 +822,7 @@ class TestGemPackage < Gem::Package::TarTestCase } tar.add_file 'checksums.yaml.gz', 0444 do |io| Zlib::GzipWriter.wrap io do |gz_io| - gz_io.write YAML.dump bogus_checksums + gz_io.write Psych.dump bogus_checksums end end end @@ -868,7 +868,7 @@ class TestGemPackage < Gem::Package::TarTestCase tar.add_file 'checksums.yaml.gz', 0444 do |io| Zlib::GzipWriter.wrap io do |gz_io| - gz_io.write YAML.dump checksums + gz_io.write Psych.dump checksums end end |