bunny 1.0.0.pre3 → 1.0.0.pre4

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/exclusive_queue_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+describe Bunny::Queue do
+  let(:connection) do
+    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c.start
+    c
+  end
+
+  after :each do
+    connection.close if connection.open?
+  end
+
+  it "is closed when the connection it was declared on is closed" do
+    ch1 = connection.create_channel
+    ch2 = connection.create_channel
+    q   = ch1.queue("", :exclusive => true)
+
+    ch1.queue_declare(q.name, :passive => true)
+    ch2.queue_declare(q.name, :passive => true)
+
+    ch1.close
+    ch2.queue_declare(q.name, :passive => true)
+
+    ch2.queue_delete(q.name)
+    ch2.close
+  end
+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/publisher_confirms_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :continuation_timeout => 10000)
     c.start
     c
   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
@@ -13,5 +22,19 @@ unless RUBY_ENGINE == "jruby"
         c.should be_closed
       end
     end
+
+    context "in the single threaded mode" do
+      n.times do |i|
+        it "can be closed (take #{i})" do
+          c  = Bunny.new(:automatically_recover => false, :threaded => false)
+          c.start
+          ch = c.create_channel
+
+          c.should be_connected
+          c.stop
+          c.should be_closed
+        end
+      end
+    end
   end
 end

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