aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-22 22:25:19 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-22 22:25:19 +0000
commitd4fd2fb0a3fe6bafedb2d28e6d42b052044e9704 (patch)
tree8d5f2335c27a4c204d7d73687a5debb1ea123ef0
parentd737d5765d43bafccb14d1da30430fb33428faed (diff)
downloadruby-d4fd2fb0a3fe6bafedb2d28e6d42b052044e9704.tar.gz
test/io/wait/test_io_wait.rb (test_wait_eof): test return value
I wrote some code which relies on this nowadays, but Ruby <=2.2 and earlier behaved differently... git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/io/wait/test_io_wait.rb4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f61d867143..a6741fd463 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 23 07:17:11 2015 Eric Wong <e@80x24.org>
+
+ * test/io/wait/test_io_wait.rb (test_wait_eof): test return value
+
Fri Oct 23 00:32:02 2015 NARUSE, Yui <naruse@ruby-lang.org>
* ext/openssl/ossl_ssl.c (ssl_npn_select_cb): explicitly raise error
diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb
index 48f6cf5c20..bef4731ae5 100644
--- a/test/io/wait/test_io_wait.rb
+++ b/test/io/wait/test_io_wait.rb
@@ -70,9 +70,11 @@ class TestIOWait < Test::Unit::TestCase
def test_wait_eof
th = Thread.new { sleep 0.01; @w.close }
+ ret = nil
assert_nothing_raised(Timeout::Error) do
- Timeout.timeout(0.1) {@r.wait}
+ Timeout.timeout(0.1) { ret = @r.wait }
end
+ assert_equal @r, ret
ensure
th.join
end