diff options
Diffstat (limited to 'spec/ruby/shared/sizedqueue/enque.rb')
| -rw-r--r-- | spec/ruby/shared/sizedqueue/enque.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/spec/ruby/shared/sizedqueue/enque.rb b/spec/ruby/shared/sizedqueue/enque.rb index 6804af3fb3..014056acda 100644 --- a/spec/ruby/shared/sizedqueue/enque.rb +++ b/spec/ruby/shared/sizedqueue/enque.rb @@ -29,7 +29,7 @@ describe :sizedqueue_enq, shared: true do q.size.should == 1 add_to_queue.call q.size.should == 2 - add_to_queue.should raise_error(ThreadError) + add_to_queue.should.raise(ThreadError) end it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do @@ -37,7 +37,7 @@ describe :sizedqueue_enq, shared: true do q << 1 t = Thread.new { - -> { q.send(@method, 2) }.should raise_error(ClosedQueueError, "queue closed") + -> { q.send(@method, 2) }.should.raise(ClosedQueueError, "queue closed") } Thread.pass until q.num_waiting == 1 @@ -90,24 +90,24 @@ describe :sizedqueue_enq, shared: true do q = @object.call(1) -> { q.send(@method, 2, timeout: "1") - }.should raise_error(TypeError, "no implicit conversion to float from string") + }.should raise_consistent_error(TypeError, "no implicit conversion of String into Float") -> { q.send(@method, 2, timeout: false) - }.should raise_error(TypeError, "no implicit conversion to float from false") + }.should raise_consistent_error(TypeError, "no implicit conversion of false into Float") end it "raise ArgumentError if non_block = true is passed too" do q = @object.call(1) -> { q.send(@method, 2, true, timeout: 1) - }.should raise_error(ArgumentError, "can't set a timeout if non_block is enabled") + }.should.raise(ArgumentError, "can't set a timeout if non_block is enabled") end it "raise ClosedQueueError when closed before enqueued" do q = @object.call(1) q.close - -> { q.send(@method, 2, timeout: 1) }.should raise_error(ClosedQueueError, "queue closed") + -> { q.send(@method, 2, timeout: 1) }.should.raise(ClosedQueueError, "queue closed") end it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do @@ -115,7 +115,7 @@ describe :sizedqueue_enq, shared: true do q << 1 t = Thread.new { - -> { q.send(@method, 1, timeout: TIME_TOLERANCE) }.should raise_error(ClosedQueueError, "queue closed") + -> { q.send(@method, 1, timeout: TIME_TOLERANCE) }.should.raise(ClosedQueueError, "queue closed") } Thread.pass until q.num_waiting == 1 |
