bunny 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a48be5011527d81ec653d8a687d5ece9ee4138f
-  data.tar.gz: ccf19ed7b3b9ec42e3e3654c8e5a6ee1cbe772eb
+  metadata.gz: d3e5ee2f2801f1420033324361e8fe9768a48e7e
+  data.tar.gz: b1f35041c2d32444ab5290301cbab613c4d63abd
 SHA512:
-  metadata.gz: bea1acb05abe8f527821d427c8a104d65c5d813996342068f00116a6832d9233d849233251c55e63b1f03b523a8b4d62fed5583cdc49cabff2d580759389c111
-  data.tar.gz: 51fc965da8fc766e8c55770d15df0d7494c68801001f5e2beb02956432919e7a151d1aa84b581f29c0b59d87d8b8415fe8d972e09ce18c90123f4823bbf96314
+  metadata.gz: 35622fd832fd559a594c7eb1bbb46576f1831d34c4bb2a1b9e4ee86e58500afa39e179785388aba9ca3a9311665f193b06d96b10429be7bc33dd6d54f98de706
+  data.tar.gz: 9f39c1e15d01f1a09f617a411f7d157028e2efe4cb4eb905564f73a08ff956e2fbbfdb0cb71cb9087aca7b0f3c0082fee348dc9ba41764876d857f2a14fdf7a2

data/.travis.yml

@@ -1,6 +1,6 @@
 bundler_args: --without development
 before_script: "./bin/ci/before_build.sh"
-script: "bundle exec rspec -c spec"
+script: "bundle exec rspec -cfs spec"
 rvm:
   - "2.0"
   - "1.9.3"
@@ -15,3 +15,6 @@ branches:
   only:
     - master
     - 0.9.x-stable
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode

data/ChangeLog.md

@@ -1,3 +1,13 @@
+## Changes between Bunny 0.10.0 and 0.10.1
+
+### Fix Abnormally Slow Bunny::Connection#close on JRuby
+
+`Bunny::Connection#close` on JRuby sometimes could enter a waiting
+state [on a native NIO/kqueue method] that lasted up to over 10 seconds.
+
+This severely affected test suite run times.
+
+
 ## Changes between Bunny 0.9.0 and 0.10.0
 
 This release has one minor **breaking API change**.

data/README.md

@@ -79,7 +79,7 @@ backwards compatible as possible but within reason.
 
 ### With Rubygems
 
-To install Bunny 0.9.x with RubyGems:
+To install Bunny with RubyGems:
 
 ```
 gem install bunny
@@ -87,17 +87,17 @@ gem install bunny
 
 ### Bundler Dependency
 
-To use Bunny 0.9.x in a project managed with Bundler:
+To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 0.9.3"
+gem "bunny", ">= 0.10.0"
 ```
 
 
-## Quick Start for Bunny 0.9.x
+## Quick Start
 
 Below is a small snippet that demonstrates how to publish
-and synchronously consume ("pull API") messages with Bunny 0.9.
+and synchronously consume ("pull API") messages with Bunny.
 
 For a 15 minute tutorial using more practical examples, see [Getting Started with RabbitMQ and Ruby using Bunny](http://rubybunny.info/articles/getting_started.html).
 

data/benchmarks/mutex_and_monitor.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "rubygems"
+require "set"
+require "thread"
+require "benchmark"
+require "monitor"
+
+puts
+puts "-" * 80
+puts "Benchmarking on #{RUBY_DESCRIPTION}"
+
+n  = 2_000_000
+mx = Mutex.new
+mt = Monitor.new
+
+# warm up the JIT, etc
+puts "Doing a warmup run..."
+n.times do |i|
+  mx.synchronize { 1 }
+  mt.synchronize { 1 }
+end
+
+t1  = Benchmark.realtime do
+  n.times do |i|
+    mx.synchronize { 1 }
+  end
+end
+r1  = (n.to_f/t1.to_f)
+
+t2  = Benchmark.realtime do
+  n.times do |i|
+    mt.synchronize { 1 }
+  end
+end
+r2  = (n.to_f/t2.to_f)
+
+puts "Mutex#synchronize, rate: #{(r1 / 1000).round(2)} KGHz"
+puts "Monitor#synchronize, rate: #{(r2 / 1000).round(2)} KGHz"
+puts
+puts "-" * 80

data/lib/bunny/exceptions.rb

@@ -55,7 +55,7 @@ module Bunny
           when Exception then
             e.message
           end
-      super("Could not estabilish TCP connection to #{hostname}:#{port}: #{m}")
+      super("Could not establish TCP connection to #{hostname}:#{port}: #{m}")
     end
   end
 
@@ -70,6 +70,9 @@ module Bunny
     end
   end
 
+  class ShutdownSignal < Exception
+  end
+
   # Raised when RabbitMQ closes TCP connection before finishing connection
   # sequence properly. This typically indicates an authentication issue.
   class PossibleAuthenticationFailureError < Exception

data/lib/bunny/reader_loop.rb

@@ -19,7 +19,6 @@ module Bunny
 
     def start
       @thread    = Thread.new(&method(:run_loop))
-      @thread.abort_on_exception = true
     end
 
     def resume
@@ -33,8 +32,10 @@ module Bunny
           break if @stopping || @network_is_down
           run_once
         rescue Errno::EBADF => ebadf
+          break if @stopping
           # ignored, happens when we loop after the transport has already been closed
         rescue AMQ::Protocol::EmptyResponseError, IOError, SystemCallError => e
+          break if @stopping
           log_exception(e)
 
           @network_is_down = true
@@ -44,7 +45,10 @@ module Bunny
           else
             @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
           end
+        rescue ShutdownSignal => _
+          break
         rescue Exception => e
+          break if @stopping
           log_exception(e)
 
           @network_is_down = true
@@ -86,6 +90,14 @@ module Bunny
       @stopped
     end
 
+    def raise(e)
+      @thread.raise(e)
+    end
+
+    def join
+      @thread.join
+    end
+
     def kill
       @thread.kill
       @thread.join

data/lib/bunny/session.rb

@@ -269,7 +269,9 @@ module Bunny
           self.close_connection(true)
         end
 
+        # puts "before maybe_shutdown_reader_loop"
         maybe_shutdown_reader_loop
+        # puts "after maybe_shutdown_reader_loop"
         close_transport
 
         @status = :closed
@@ -626,10 +628,19 @@ module Bunny
     def maybe_shutdown_reader_loop
       if @reader_loop
         @reader_loop.stop
-        # We don't need to kill the loop but
         # this is the easiest way to wait until the loop
         # is guaranteed to have terminated
-        @reader_loop.kill
+        @reader_loop.raise(ShutdownSignal)
+        # joining the thread here may take forever
+        # on JRuby because sun.nio.ch.KQueueArrayWrapper#kevent0 is
+        # a native method that cannot be (easily) interrupted.
+        # So we use this ugly hack or else our test suite takes forever
+        # to run on JRuby (a new connection is opened/closed per example). MK.
+        if RUBY_ENGINE == "jruby"
+          sleep 0.075
+        else
+          @reader_loop.join
+        end
       end
 
       @reader_loop = nil

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/spec/higher_level_api/integration/basic_cancel_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Consumer, "#cancel" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -8,7 +8,7 @@ describe Bunny::Queue, "#subscribe" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/basic_nack_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Channel, "#nack" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/basic_publish_spec.rb

@@ -8,7 +8,7 @@ if RUBY_VERSION <= "1.9"
       c
     end
 
-    after :all do
+    after :each do
       connection.close if connection.open?
     end
 

data/spec/higher_level_api/integration/basic_qos_spec.rb

@@ -7,25 +7,22 @@ describe Bunny::Channel, "#prefetch" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 
-
-  subject do
-    connection.create_channel
-  end
-
   context "with a positive integer" do
     it "sets that prefetch level via basic.qos" do
-      subject.prefetch(10).should be_instance_of(AMQ::Protocol::Basic::QosOk)
+      ch = connection.create_channel
+      ch.prefetch(10).should be_instance_of(AMQ::Protocol::Basic::QosOk)
     end
   end
 
   context "with a negative integer" do
     it "raises an ArgumentError" do
+      ch = connection.create_channel
       expect {
-        subject.prefetch(-2)
+        ch.prefetch(-2)
       }.to raise_error(ArgumentError)
     end
   end

data/spec/higher_level_api/integration/basic_reject_spec.rb

@@ -7,65 +7,64 @@ describe Bunny::Channel, "#reject" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 
-  subject do
-    connection.create_channel
-  end
-
   context "with requeue = true" do
     it "requeues a message" do
-      q = subject.queue("bunny.basic.reject.manual-acks", :exclusive => true)
-      x = subject.default_exchange
+      ch = connection.create_channel
+      q  = ch.queue("bunny.basic.reject.manual-acks", :exclusive => true)
+      x  = ch.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.5)
       q.message_count.should == 1
       delivery_info, _, _ = q.pop(:ack => true)
 
-      subject.reject(delivery_info.delivery_tag, true)
+      ch.reject(delivery_info.delivery_tag, true)
       sleep(0.5)
       q.message_count.should == 1
 
-      subject.close
+      ch.close
     end
   end
 
   context "with requeue = false" do
     it "rejects a message" do
-      q = subject.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
-      x = subject.default_exchange
+      ch = connection.create_channel
+      q  = ch.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
+      x  = ch.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.5)
       q.message_count.should == 1
       delivery_info, _, _ = q.pop(:ack => true)
 
-      subject.reject(delivery_info.delivery_tag, false)
+      ch.reject(delivery_info.delivery_tag, false)
       sleep(0.5)
       q.message_count.should == 0
 
-      subject.close
+      ch.close
     end
   end
 
 
   context "with an invalid (random) delivery tag" do
     it "causes a channel-level error" do
-      q = subject.queue("bunny.basic.reject.unknown-delivery-tag", :exclusive => true)
-      x = subject.default_exchange
+      ch = connection.create_channel
+      q  = ch.queue("bunny.basic.reject.unknown-delivery-tag", :exclusive => true)
+      x  = ch.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.25)
       q.message_count.should == 1
       _, _, content = q.pop(:ack => true)
 
-      subject.on_error do |ch, channel_close|
+      ch.on_error do |ch, channel_close|
         @channel_close = channel_close
       end
-      subject.reject(82, true)
+      ch.reject(82, true)
 
       sleep 0.5
 

data/spec/higher_level_api/integration/basic_return_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Exchange, "#publish" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/channel_close_spec.rb

@@ -7,21 +7,17 @@ describe Bunny::Channel, "when closed" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 
-
-  subject do
-    connection.create_channel
-  end
-
   it "releases the id" do
-    n = subject.number
+    ch = connection.create_channel
+    n = ch.number
 
-    subject.should be_open
-    subject.close
-    subject.should be_closed
+    ch.should be_open
+    ch.close
+    ch.should be_closed
 
     # a new channel with the same id can be created
     connection.create_channel(n)

data/spec/higher_level_api/integration/channel_flow_spec.rb

@@ -7,18 +7,15 @@ describe Bunny::Channel, "#flow" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 
-
-  subject do
-    connection.create_channel
-  end
-
   it "is supported" do
-    subject.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
-    subject.flow(false).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
-    subject.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
+    ch = connection.create_channel
+
+    ch.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
+    ch.flow(false).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
+    ch.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
   end
 end

data/spec/higher_level_api/integration/channel_open_spec.rb

@@ -7,51 +7,42 @@ describe Bunny::Channel, "when opened" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 
   context "without explicitly provided id" do
-    subject do
-      connection.create_channel
-    end
-
     it "gets an allocated id and is successfully opened" do
       connection.should be_connected
-      subject.should be_open
+      ch = connection.create_channel
+      ch.should be_open
 
-      subject.id.should be > 0
+      ch.id.should be > 0
     end
   end
 
 
   context "with explicitly provided id" do
-    subject do
-      connection.create_channel(767)
-    end
-
     it "uses that id and is successfully opened" do
+      ch = connection.create_channel(767)
       connection.should be_connected
-      subject.should be_open
+      ch.should be_open
 
-      subject.id.should == 767
+      ch.id.should == 767
     end
   end
 
 
 
   context "with explicitly provided id that is already taken" do
-    subject do
-      connection.create_channel(767)
-    end
-
     it "reuses the channel that is already opened" do
+      ch = connection.create_channel(767)
       connection.should be_connected
-      subject.should be_open
+      ch.should be_open
 
-      subject.id.should == 767
+      ch.id.should == 767
 
-      connection.create_channel(767).should == subject
+      connection.create_channel(767).should == ch
     end
   end
 end

data/spec/higher_level_api/integration/confirm_select_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Channel, "#confirm_select" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/connection_spec.rb

@@ -284,7 +284,7 @@ describe Bunny::Session do
 
 
   context "initialized with :host => 127.0.0.1 and non-default credentials (take 2)" do
-    after :all do
+    after :each do
       subject.close if subject.open?
     end
 

data/spec/higher_level_api/integration/consistent_hash_exchange_spec.rb

@@ -9,7 +9,7 @@ unless ENV["CI"]
       c
     end
 
-    after :all do
+    after :each do
       connection.close
     end
 

data/spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Channel do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/dead_lettering_spec.rb

@@ -7,7 +7,7 @@ describe "A message" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/exchange_bind_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Exchange do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/exchange_declare_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Exchange do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 

data/spec/higher_level_api/integration/exchange_delete_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Exchange, "#delete" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/exchange_unbind_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Exchange do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/merry_go_round_spec.rb

@@ -31,7 +31,7 @@ describe "A message that is proxied by multiple intermediate consumers" do
     c
   end
 
-  after :all do
+  after :each do
     [c1, c2, c3, c4, c5].each do |c|
       c.close if c.open?
     end

data/spec/higher_level_api/integration/message_properties_access_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Queue, "#subscribe" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/predeclared_exchanges_spec.rb

@@ -7,7 +7,7 @@ describe "amq.* exchanges" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/publishing_edge_cases_spec.rb

@@ -11,7 +11,7 @@ unless ENV["CI"]
       c
     end
 
-    after :all do
+    after :each do
       connection.close if connection.open?
     end
 

data/spec/higher_level_api/integration/queue_declare_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Queue do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/queue_delete_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Queue, "#delete" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 
@@ -22,7 +22,7 @@ describe Bunny::Queue, "#delete" do
       expect {
         q.delete
       }.to raise_error(Bunny::NotFound)
-      
+
       ch.queues.size.should == 0
     end
   end

data/spec/higher_level_api/integration/queue_purge_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Queue do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 

data/spec/higher_level_api/integration/queue_unbind_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Queue, "bound to an exchange" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 
@@ -37,7 +37,7 @@ describe Bunny::Queue, "NOT bound to an exchange" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 

data/spec/higher_level_api/integration/read_only_consumer_spec.rb

@@ -13,7 +13,7 @@ describe Bunny::Queue, "#subscribe" do
     c
   end
 
-  after :all do
+  after :each do
     publisher_connection.close if publisher_connection.open?
     consumer_connection.close  if consumer_connection.open?
   end

data/spec/higher_level_api/integration/sender_selected_distribution_spec.rb

@@ -7,7 +7,7 @@ describe "Sender-selected distribution" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 
@@ -23,7 +23,7 @@ describe "Sender-selected distribution" do
     n.times do |i|
       x.publish("Message #{i}", :routing_key => "one", :headers => {"CC" => ["two", "three"]})
     end
-    
+
     sleep 0.5
 
     q1.message_count.should == n

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -15,7 +15,7 @@ unless ENV["CI"]
       c
     end
 
-    after :all do
+    after :each do
       connection.close
     end
 
@@ -57,7 +57,7 @@ unless ENV["CI"]
       c
     end
 
-    after :all do
+    after :each do
       connection.close
     end
 

data/spec/higher_level_api/integration/tx_commit_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Channel, "#tx_commit" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/tx_rollback_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Channel, "#tx_rollback" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/stress/connection_open_close_spec.rb

@@ -1,8 +1,17 @@
 require "spec_helper"
 
-unless RUBY_ENGINE == "jruby"
+unless RUBY_ENGINE == "jruby" && !ENV["FORCE_JRUBY_RUN"]
   describe Bunny::Session do
-    4000.times do |i|
+    # creating thousands of connections means creating
+    # twice as many threads and this won't fly with the JVM
+    # in CI containers. MK.
+    n = if RUBY_ENGINE == "jruby"
+          250
+        else
+          2500
+        end
+
+    n.times do |i|
       it "can be closed (take #{i})" do
         c  = Bunny.new(:automatically_recover => false)
         c.start

data/spec/unit/concurrent/condition_spec.rb

@@ -2,73 +2,80 @@ require "spec_helper"
 require "bunny/concurrent/condition"
 
 describe Bunny::Concurrent::Condition do
+
   describe "#wait" do
-    it "blocks current thread until notified" do
-      condition = described_class.new
-      xs        = []
+    100.times do |i|
+      it "blocks current thread until notified (take #{i})" do
+        condition = described_class.new
+        xs        = []
 
-      t = Thread.new do
-        xs << :notified
+        t = Thread.new do
+          xs << :notified
 
-        sleep 0.25
-        condition.notify
-      end
-      t.abort_on_exception = true
+          sleep 0.25
+          condition.notify
+        end
+        t.abort_on_exception = true
 
-      condition.wait
-      xs.should == [:notified]
+        condition.wait
+        xs.should == [:notified]
+      end
     end
   end
 
   describe "#notify" do
-    it "notifies a single thread waiting on the latch" do
-      mutex     = Mutex.new
-      condition = described_class.new
-      xs        = []
+    100.times do |i|
+      it "notifies a single thread waiting on the latch (take #{i})" do
+        mutex     = Mutex.new
+        condition = described_class.new
+        xs        = []
 
-      t1 = Thread.new do
-        condition.wait
-        mutex.synchronize { xs << :notified1 }
-      end
-      t1.abort_on_exception = true
+        t1 = Thread.new do
+          condition.wait
+          mutex.synchronize { xs << :notified1 }
+        end
+        t1.abort_on_exception = true
 
-      t2 = Thread.new do
-        condition.wait
-        mutex.synchronize { xs << :notified2 }
-      end
-      t2.abort_on_exception = true
+        t2 = Thread.new do
+          condition.wait
+          mutex.synchronize { xs << :notified2 }
+        end
+        t2.abort_on_exception = true
 
-      sleep 0.25
-      condition.notify
-      sleep 0.5
-      xs.should satisfy { |ys| ys.size == 1 && (ys.include?(:notified1) || ys.include?(:notified2)) }
+        sleep 0.25
+        condition.notify
+        sleep 0.5
+        xs.should satisfy { |ys| ys.size == 1 && (ys.include?(:notified1) || ys.include?(:notified2)) }
+      end
     end
   end
 
   describe "#notify_all" do
-    let(:n) { 120 }
+    let(:n) { 30 }
 
-    it "notifies all the threads waiting on the latch" do
-      mutex     = Mutex.new
-      condition = described_class.new
-      @xs       = []
+    100.times do |i|
+      it "notifies all the threads waiting on the latch (take #{i})" do
+        mutex     = Mutex.new
+        condition = described_class.new
+        @xs       = []
 
-      n.times do |i|
-        t = Thread.new do
-          condition.wait
-          mutex.synchronize { @xs << "notified#{i + 1}".to_sym }
+        n.times do |i|
+          t = Thread.new do
+            condition.wait
+            mutex.synchronize { @xs << "notified#{i + 1}".to_sym }
+          end
+          t.abort_on_exception = true
         end
-        t.abort_on_exception = true
-      end
 
-      sleep 0.5
-      condition.notify_all
-      sleep 0.5
+        sleep 0.5
+        condition.notify_all
+        sleep 0.5
 
-      n.times do |i|
-        item = "notified#{i + 1}".to_sym
+        n.times do |i|
+          item = "notified#{i + 1}".to_sym
 
-        @xs.should include(item)
+          @xs.should include(item)
+        end
       end
     end
   end

data/spec/unit/concurrent/synchronized_sorted_set_spec.rb

@@ -1,34 +1,73 @@
 require "spec_helper"
 require "bunny/concurrent/synchronized_sorted_set"
 
-describe Bunny::Concurrent::SynchronizedSortedSet do
-  it "synchronizes common operations needed by Bunny" do
-    s = described_class.new
-    s.length.should == 0
+unless ENV["CI"]
+  describe Bunny::Concurrent::SynchronizedSortedSet do
+    50.times do |i|
+      it "provides the same API as SortedSet for key operations (take #{i})" do
+        s = described_class.new
+        s.length.should == 0
 
-    10.times do
-      Thread.new do
         s << 1
+        s.length.should == 1
         s << 1
+        s.length.should == 1
         s << 2
+        s.length.should == 2
         s << 3
+        s.length.should == 3
         s << 4
+        s.length.should == 4
         s << 4
         s << 4
         s << 4
+        s.length.should == 4
         s << 5
+        s.length.should == 5
         s << 5
         s << 5
         s << 5
+        s.length.should == 5
         s << 6
+        s.length.should == 6
         s << 7
+        s.length.should == 7
         s << 8
+        s.length.should == 8
         s.delete 8
+        s.length.should == 7
         s.delete_if { |i| i == 1 }
+        s.length.should == 6
       end
-    end
-    sleep 2.0
+      it "synchronizes common operations needed by Bunny (take #{i})" do
+        s = described_class.new
+        s.length.should == 0
+
+        10.times do
+          Thread.new do
+            s << 1
+            s << 1
+            s << 2
+            s << 3
+            s << 4
+            s << 4
+            s << 4
+            s << 4
+            s << 5
+            s << 5
+            s << 5
+            s << 5
+            s << 6
+            s << 7
+            s << 8
+            s.delete 8
+            s.delete_if { |i| i == 1 }
+          end
+        end
+        sleep 0.5
 
-    s.length.should == 6
+        s.length.should == 6
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -54,6 +54,7 @@ files:
 - benchmarks/basic_publish/with_4K_messages.rb
 - benchmarks/basic_publish/with_64K_messages.rb
 - benchmarks/channel_open.rb
+- benchmarks/mutex_and_monitor.rb
 - benchmarks/queue_declare.rb
 - benchmarks/queue_declare_and_bind.rb
 - benchmarks/queue_declare_bind_and_delete.rb