archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* lib/rubygems/test_case.rb: run test with psych if exist.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-08-22 02:22:03 +00:00
parent 1497959ef5
commit 7a69af7461
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Aug 22 11:20:47 2012 NARUSE, Yui <naruse@ruby-lang.org>
* lib/rubygems/test_case.rb: run test with psych if exist.
Thu Aug 16 12:09:51 2012 Yuki Yugui Sonoda <yugui@google.com> Thu Aug 16 12:09:51 2012 Yuki Yugui Sonoda <yugui@google.com>
* nacl/pepper_main.c (init_loadpath): Pushes the correct load path on * nacl/pepper_main.c (init_loadpath): Pushes the correct load path on

5
lib/rubygems/test_case.rb
View file

@ -207,6 +207,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase
Gem.pre_uninstall do |uninstaller| Gem.pre_uninstall do |uninstaller|
@pre_uninstall_hook_arg = uninstaller @pre_uninstall_hook_arg = uninstaller
end end
@orig_yamler = YAML::ENGINE.yamler
YAML::ENGINE.yamler = 'psych' rescue nil
end end
## ##
@ -238,6 +241,8 @@ class Gem::TestCase < MiniTest::Unit::TestCase
else else
ENV.delete 'HOME' ENV.delete 'HOME'
end end
YAML::ENGINE.yamler = @orig_yamler
end end
## ##

7
test/rubygems/test_gem_specification.rb
View file

@ -39,8 +39,6 @@ end
def setup def setup
super super
@orig_yamler = YAML::ENGINE.yamler
YAML::ENGINE.yamler = 'psych'
@a1 = quick_spec 'a', '1' do |s| @a1 = quick_spec 'a', '1' do |s|
s.executable = 'exec' s.executable = 'exec'
@ -67,11 +65,6 @@ end
load 'rubygems/syck_hack.rb' load 'rubygems/syck_hack.rb'
end end
def teardown
super
YAML::ENGINE.yamler = @orig_yamler
end
def test_self_attribute_names def test_self_attribute_names
expected_value = %w[ expected_value = %w[
authors authors