[ruby/irb] Fix 2 minor issues in test suite

* undefine Kernel#irb_original_require in without_rdoc method
* Don't rescue all LoadErrors/NameErrors in test_rendering.rb, just
the one for require 'yamatanooroti'

https://github.com/ruby/irb/commit/52b79806ea

1 files changed, 6 insertions, 3 deletions

diff --git a/test/irb/helper.rb b/test/irb/helper.rb
index e4ce7bff08..f4f969e889 100644
--- a/test/irb/helper.rb
+++ b/test/irb/helper.rb
@@ -57,11 +57,11 @@ module TestIRB
     end
 
     def without_rdoc(&block)
-      ::Kernel.send(:alias_method, :old_require, :require)
+      ::Kernel.send(:alias_method, :irb_original_require, :require)
 
       ::Kernel.define_method(:require) do |name|
         raise LoadError, "cannot load such file -- rdoc (test)" if name.match?("rdoc") || name.match?(/^rdoc\/.*/)
-        ::Kernel.send(:old_require, name)
+        ::Kernel.send(:irb_original_require, name)
       end
 
       yield
@@ -70,7 +70,10 @@ module TestIRB
         require_relative "../lib/envutil"
       rescue LoadError # ruby/ruby defines EnvUtil differently
       end
-      EnvUtil.suppress_warning { ::Kernel.send(:alias_method, :require, :old_require) }
+      EnvUtil.suppress_warning {
+        ::Kernel.send(:alias_method, :require, :irb_original_require)
+        ::Kernel.undef_method :irb_original_require
+      }
     end
   end
 end