summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-09 05:52:18 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-09 05:52:18 +0000
commit3c45e3f1b77ddbc63ed8528a71f959ff5dfaf272 (patch)
tree7032b8d3ae154e48e92f3a8030416977ce6b0257 /test
parenta21d0f72c280a3effe15554279ae006918cd97ce (diff)
Rescue even if it test_readpartial_locktmp RuntimeError. [Bug#6099]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_io.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index b1e99055a1..b08e0753bf 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -2249,12 +2249,12 @@ End
th = Thread.new {r.sysread(100, buf)}
Thread.pass until th.stop?
buf.replace("")
- assert_empty(buf)
+ assert_empty(buf, bug6099)
w.write(data)
Thread.pass while th.alive?
th.join
end
- assert_equal(data, buf)
+ assert_equal(data, buf, bug6099)
end
def test_readpartial_locktmp
@@ -2267,11 +2267,12 @@ End
th = Thread.new {r.readpartial(100, buf)}
Thread.pass until th.stop?
buf.replace("")
- assert_empty(buf)
+ assert_empty(buf, bug6099)
w.write(data)
Thread.pass while th.alive?
th.join
end
- assert_equal(data, buf)
+ assert_equal(data, buf, bug6099)
+ rescue RuntimeError # can't modify string; temporarily locked
end
end