diff options
author | lukeg <luke.gru@gmail.com> | 2023-03-13 18:13:21 -0400 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-03-17 08:46:37 +0900 |
commit | d2c6dca8f4a9fb3e6b9748758ee9eb75fa18622a (patch) | |
tree | c2c58ed7613bb74f14c9e16510112acc132e0bd5 /test/ruby | |
parent | 5825d7d4a1a53ba84909a01679f4dfab63fa9739 (diff) |
Fix small issues concerning namespacing in test-all suite
* Fix temporary methods on Object leaking across test cases.
* Remove temporary classes/modules leaking across test cases.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/7513
Diffstat (limited to 'test/ruby')
-rw-r--r-- | test/ruby/test_eval.rb | 3 | ||||
-rw-r--r-- | test/ruby/test_iseq.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_module.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_require.rb | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb index d55977c986..af255c05c8 100644 --- a/test/ruby/test_eval.rb +++ b/test/ruby/test_eval.rb @@ -488,6 +488,9 @@ class TestEval < Test::Unit::TestCase end end assert_equal(feature6609, feature6609_method) + ensure + Object.undef_method(:feature6609_block) rescue nil + Object.undef_method(:feature6609_method) rescue nil end def test_eval_using_integer_as_binding diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb index 563aeeeaea..3692a697d6 100644 --- a/test/ruby/test_iseq.rb +++ b/test/ruby/test_iseq.rb @@ -637,6 +637,8 @@ class TestISeq < Test::Unit::TestCase } lines + ensure + Object.send(:remove_const, :A) rescue nil end def test_to_binary_line_tracepoint diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 1ae48ef2bd..f566eced3a 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1728,6 +1728,8 @@ class TestModule < Test::Unit::TestCase assert_equal("TestModule::C\u{df}", c.name, '[ruby-core:24600]') c = Module.new.module_eval("class X\u{df} < Module; self; end") assert_match(/::X\u{df}:/, c.new.to_s) + ensure + Object.send(:remove_const, "C\u{df}") end diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index e0cfc8c914..60e5b0f8b1 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -210,6 +210,7 @@ class TestRequire < Test::Unit::TestCase assert_not_nil(bt = e.backtrace, "no backtrace") assert_not_empty(bt.find_all {|b| b.start_with? __FILE__}, proc {bt.inspect}) end + ensure $LOADED_FEATURES.replace loaded_features end |