[前][次][番号順一覧][スレッド一覧]

ruby-changes:66549

From: Yusuke <ko1@a...>
Date: Tue, 22 Jun 2021 16:38:33 +0900 (JST)
Subject: [ruby-changes:66549] ff609eee98 (master): Avoid a duplicated method definition of Object#stub

https://git.ruby-lang.org/ruby.git/commit/?id=ff609eee98

From ff609eee98dc5c20f68b7befac147537e640aad1 Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Tue, 22 Jun 2021 16:36:36 +0900
Subject: Avoid a duplicated method definition of Object#stub

http://rubyci.s3.amazonaws.com/ubuntu/ruby-master/log/20210622T063005Z.log.html.gz
```
/home/chkbuild/chkbuild/tmp/build/20210622T063005Z/ruby/test/rubygems/helper.rb:1565: warning: method redefined; discarding old stub
/home/chkbuild/chkbuild/tmp/build/20210622T063005Z/ruby/test/resolv/test_dns.rb:8: warning: previous definition of stub was here
```
---
 test/rubygems/helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index 9854263..6635481 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -1591,7 +1591,7 @@ class Object https://github.com/ruby/ruby/blob/trunk/test/rubygems/helper.rb#L1591
     metaclass.send :undef_method, name
     metaclass.send :alias_method, name, new_name
     metaclass.send :undef_method, new_name
-  end
+  end unless method_defined?(:stub) # lib/resolv/test_dns.rb also has the same method definition
 end
 
 require_relative 'utilities'
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]