kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix ObjectSpace.dump(obj, output: :stdout)

Browse source 
RDoc says `ObjectSpace.dump(obj, output: :stdout)   # => nil`,
but it returns STDOUT since fbba6bd4e3.

I think it is unintentional change.
This commit is contained in:
Kazuhiro NISHIYAMA 2020-10-02 18:19:04 +09:00 committed by Kazuhiro NISHIYAMA
parent dd77796f1c
commit d0a7189f26
Notes: git 2020-10-03 00:00:39 +09:00 
Merged: https://github.com/ruby/ruby/pull/3620
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/objspace/lib/objspace.rb
View file

@ -36,7 +36,9 @@ module ObjectSpace
raise ArgumentError, "wrong output option: #{output.inspect}"
end
_dump(obj, out)
ret = _dump(obj, out)
return nil if output == :stdout
ret
end
@ -82,6 +84,8 @@ module ObjectSpace
raise ArgumentError, "wrong output option: #{output.inspect}"
end
_dump_all(out, full, since)
ret = _dump_all(out, full, since)
return nil if output == :stdout
ret
end
end

21
test/objspace/test_objspace.rb
View file

@ -318,8 +318,9 @@ class TestObjSpace < Test::Unit::TestCase
ObjectSpace.dump_all(output: :stdout)
end
dump_my_heap_please
p dump_my_heap_please
end;
assert_equal 'nil', output.pop
heap = output.find_all { |l|
obj = JSON.parse(l)
obj['type'] == "IMEMO" && obj['imemo_type']
@ -335,8 +336,9 @@ class TestObjSpace < Test::Unit::TestCase
ObjectSpace.dump_all(output: :stdout, full: true)
end
dump_my_heap_please
p dump_my_heap_please
end;
assert_equal 'nil', output.pop
heap = output.find_all { |l| JSON.parse(l)['type'] == "NONE" }
assert_operator heap.length, :>, 0
end
@ -356,8 +358,9 @@ class TestObjSpace < Test::Unit::TestCase
ObjectSpace.dump_all(output: :stdout, since: gc_gen)
end
dump_my_heap_please
p dump_my_heap_please
end;
assert_equal 'nil', output.pop
since = output.shift.to_i
assert_operator output.size, :>, 0
generations = output.map { |l| JSON.parse(l)["generation"] }.uniq.sort
@ -374,8 +377,9 @@ class TestObjSpace < Test::Unit::TestCase
ObjectSpace.dump_all(output: $stdout)
end
dump_my_heap_please
p $stdout == dump_my_heap_please
end;
assert_equal 'true', output.pop
needle = JSON.parse(output.first)
addr = needle['address']
found = output.drop(1).find { |l| JSON.parse(l)['address'] == addr }
@ -392,8 +396,9 @@ class TestObjSpace < Test::Unit::TestCase
ObjectSpace.dump_all(output: $stdout)
end
dump_my_heap_please
p $stdout == dump_my_heap_please
end;
assert_equal 'true', output.pop
needle = JSON.parse(output.first)
addr = needle['class']
found = output.drop(1).find { |l| JSON.parse(l)['address'] == addr }
@ -430,8 +435,9 @@ class TestObjSpace < Test::Unit::TestCase
ObjectSpace.dump_all(output: $stdout)
end
dump_my_heap_please
p $stdout == dump_my_heap_please
end;
assert_equal 'true', output.pop
needle = JSON.parse(output.first)
addr = needle['address']
found = output.drop(1).find { |l| (JSON.parse(l)['references'] || []).include? addr }
@ -452,8 +458,9 @@ class TestObjSpace < Test::Unit::TestCase
ObjectSpace.dump_all(output: :stdout)
end
dump_my_heap_please
p dump_my_heap_please
end;
assert_equal 'nil', output.pop
assert_match(entry, output.grep(/TEST STRING/).join("\n"))
end