aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-05 09:04:13 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-05 09:04:13 +0000
commit81577c26ee741b69b1a5e7215eca9b4b0b3092bf (patch)
tree6e83af74d85ab013492d39682499c780b4aa50c2
parent1498b668d2f8dc4eef3254dbdb2eb015a271fcf2 (diff)
downloadruby-81577c26ee741b69b1a5e7215eca9b4b0b3092bf.tar.gz
* test/io/nonblock/test_flush.rb (TestIONonblock#test_flush):
rescue some exceptions. [ruby-dev:35638] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/io/nonblock/test_flush.rb6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fb4345d043..d4940a8f9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 5 18:02:53 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * test/io/nonblock/test_flush.rb (TestIONonblock#test_flush):
+ rescue some exceptions. [ruby-dev:35638]
+
Tue Aug 5 16:40:06 2008 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/ftp.rb (chdir): handle 5xx errors correctly.
diff --git a/test/io/nonblock/test_flush.rb b/test/io/nonblock/test_flush.rb
index b41afe1101..2217dbcec9 100644
--- a/test/io/nonblock/test_flush.rb
+++ b/test/io/nonblock/test_flush.rb
@@ -24,7 +24,11 @@ class TestIONonblock < Test::Unit::TestCase
result << s
end
}
- w.flush # assert_raise(IOError, "[ruby-dev:24985]") {w.flush}
+ begin
+ w.flush # assert_raise(IOError, "[ruby-dev:24985]") {w.flush}
+ rescue Errno::EBADF, IOError
+ # ignore [ruby-dev:35638]
+ end
assert_nothing_raised {t.join}
}
assert_equal(4097, result.size)