mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Update to ruby/spec@875a09e
This commit is contained in:
parent
a06301b103
commit
5c276e1cc9
1247 changed files with 5316 additions and 5028 deletions
|
@ -19,28 +19,28 @@ describe "Thread#join" do
|
|||
t.join(0).should equal(t)
|
||||
t.join(0.0).should equal(t)
|
||||
t.join(nil).should equal(t)
|
||||
lambda { t.join(:foo) }.should raise_error TypeError
|
||||
lambda { t.join("bar") }.should raise_error TypeError
|
||||
-> { t.join(:foo) }.should raise_error TypeError
|
||||
-> { t.join("bar") }.should raise_error TypeError
|
||||
end
|
||||
|
||||
it "returns nil if it is not finished when given a timeout" do
|
||||
c = Channel.new
|
||||
t = Thread.new { c.receive }
|
||||
q = Queue.new
|
||||
t = Thread.new { q.pop }
|
||||
begin
|
||||
t.join(0).should == nil
|
||||
ensure
|
||||
c << true
|
||||
q << true
|
||||
end
|
||||
t.join.should == t
|
||||
end
|
||||
|
||||
it "accepts a floating point timeout length" do
|
||||
c = Channel.new
|
||||
t = Thread.new { c.receive }
|
||||
q = Queue.new
|
||||
t = Thread.new { q.pop }
|
||||
begin
|
||||
t.join(0.01).should == nil
|
||||
ensure
|
||||
c << true
|
||||
q << true
|
||||
end
|
||||
t.join.should == t
|
||||
end
|
||||
|
@ -50,7 +50,7 @@ describe "Thread#join" do
|
|||
Thread.current.report_on_exception = false
|
||||
raise NotImplementedError.new("Just kidding")
|
||||
}
|
||||
lambda { t.join }.should raise_error(NotImplementedError)
|
||||
-> { t.join }.should raise_error(NotImplementedError)
|
||||
end
|
||||
|
||||
it "returns the dead thread" do
|
||||
|
@ -60,6 +60,6 @@ describe "Thread#join" do
|
|||
|
||||
it "raises any uncaught exception encountered in ensure block" do
|
||||
t = ThreadSpecs.dying_thread_ensures { raise NotImplementedError.new("Just kidding") }
|
||||
lambda { t.join }.should raise_error(NotImplementedError)
|
||||
-> { t.join }.should raise_error(NotImplementedError)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue