diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-15 01:09:10 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-15 01:09:10 +0000 |
commit | 780e7d0951aefa64264e21d15d8deefeded6465f (patch) | |
tree | 871f68a1eb5e21cb290165a3372d31eac3745bab /test | |
parent | e1aa72d44104297b51d0fd05dfb5858f3ccd8522 (diff) | |
download | ruby-780e7d0951aefa64264e21d15d8deefeded6465f.tar.gz |
Revert r36699 and r36700. [Feature #6130]
Revert "Kernel#inspect: improve consistency and do not call #to_s."
Revert "update PP with recent Kernel#inspect change. Patch by Yusuke Endoh."
r36699 cause test-all failure on test/drb/test_drb.rb and
test/drb/test_drbssl.rb. Run test-all before commit.
Moreover its ChangeLog formst is wrong: see CommitterHowto
https://bugs.ruby-lang.org/projects/ruby/wiki/CommitterHowto#ChangeLog
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_object.rb | 25 | ||||
-rw-r--r-- | test/test_pp.rb | 1 |
2 files changed, 1 insertions, 25 deletions
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index 61482f7c1a..70dcd04201 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -690,31 +690,6 @@ class TestObject < Test::Unit::TestCase assert_equal(true, s.tainted?) end - def test_inspect - x = Object.new - assert_match(/\A#<Object:0x\h+>\z/, x.inspect) - - x.instance_variable_set(:@ivar, :value) - assert_match(/\A#<Object:0x\h+ @ivar=:value>\z/, x.inspect) - - x = Object.new - x.instance_variable_set(:@recur, x) - assert_match(/\A#<Object:0x\h+ @recur=#<Object:0x\h+ \.\.\.>>\z/, x.inspect) - - x = Object.new - x.instance_variable_set(:@foo, "value") - x.instance_variable_set(:@bar, 42) - assert_match(/\A#<Object:0x\h+ (?:@foo="value", @bar=42|@bar=42, @foo="value")>\z/, x.inspect) - - # #inspect does not call #to_s anymore - feature6130 = '[ruby-core:43238]' - x = Object.new - def x.to_s - "to_s" - end - assert_match(/\A#<Object:0x\h+>\z/, x.inspect, feature6130) - end - def test_exec_recursive Thread.current[:__recursive_key__] = nil a = [[]] diff --git a/test/test_pp.rb b/test/test_pp.rb index acd3e835b9..fe65287d88 100644 --- a/test/test_pp.rb +++ b/test/test_pp.rb @@ -118,6 +118,7 @@ class PPInspectTest < Test::Unit::TestCase def a.to_s() "aaa" end result = PP.pp(a, '') assert_equal("#{a.inspect}\n", result) + assert_equal("aaa\n", result) end end |