summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-22 18:20:20 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-22 18:20:20 +0000
commitf4cacdc4e2803b1e572d9a3e9544f53a2c1d88cb (patch)
tree1ae022463684cb039fede6cc6f721834ef90e430
parent5e183c725570c1f1778efab1dc6f874dcdb2922e (diff)
Revert r53253. naruse fixed it differently in r53244
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/socket/test_basicsocket.rb3
2 files changed, 1 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 068b039..00ce4b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Wed Dec 23 03:05:12 2015 Eric Wong <e@80x24.org>
-
- * test/socket/test_basicsocket.rb: attempt fix for [ruby-cvs:60402]
-
Wed Dec 23 02:59:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (__STDC_WANT_LIB_EXT1__): necessary to use memset_s
diff --git a/test/socket/test_basicsocket.rb b/test/socket/test_basicsocket.rb
index ac35f709..52732f1 100644
--- a/test/socket/test_basicsocket.rb
+++ b/test/socket/test_basicsocket.rb
@@ -134,8 +134,7 @@ class TestSocket_BasicSocket < Test::Unit::TestCase
end
def test_for_fd
- assert_raise(ArgumentError, # [ruby-cvs:60402]
- Errno::EBADF, '[ruby-core:72418] [Bug #11854]') do
+ assert_raise(Errno::EBADF, '[ruby-core:72418] [Bug #11854]') do
BasicSocket.for_fd(-1)
end
inet_stream do |sock|