bunny 0.10.8 → 1.0.0.pre1

data/spec/higher_level_api/integration/confirm_select_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Channel, "#confirm_select" do
     c
   end
 
-  after :each do
+  after :all 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 :each do
+    after :all 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 :each do
+    after :all 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 :each do
+  after :all do
     connection.close if connection.open?
   end
 
@@ -80,49 +80,4 @@ describe Bunny::Channel do
       ch.close
     end
   end
-
-
-
-  context "with consumer re-registration" do
-    class ExampleConsumerThatReregisters < Bunny::Consumer
-      def handle_cancellation(_)
-        @queue = @channel.queue("basic.consume.after_cancellation", :auto_delete => true)
-        @channel.basic_consume_with(self)
-      end
-    end
-
-    let(:queue_name) { "basic.consume#{rand}" }
-
-    it "works correctly" do
-      consumer = nil
-      xs       = []
-
-      ch = connection.create_channel
-      t  = Thread.new do
-        ch2 = connection.create_channel
-        q   = ch2.queue(queue_name, :auto_delete => true)
-
-        consumer = ExampleConsumerThatReregisters.new(ch2, q, "")
-        consumer.on_delivery do |_, _, payload|
-          xs << payload
-        end
-        q.subscribe_with(consumer)
-      end
-      t.abort_on_exception = true
-
-      sleep 0.5
-      x = ch.default_exchange
-      x.publish("abc", :routing_key => queue_name)
-
-      sleep 0.5
-      ch.queue(queue_name, :auto_delete => true).delete
-
-      x.publish("abc", :routing_key => queue_name)
-      sleep 0.5
-      q = ch.queue("basic.consume.after_cancellation", :auto_delete => true)
-      xs.should == ["abc"]
-
-      ch.close
-    end
-  end
 end

data/spec/higher_level_api/integration/dead_lettering_spec.rb

@@ -7,7 +7,7 @@ describe "A message" do
     c
   end
 
-  after :each do
+  after :all 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 :each do
+  after :all 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 :each do
+  after :all 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 :each do
+  after :all 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 :each do
+  after :all 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 :each do
+  after :all 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 :each do
+  after :all 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 :each do
+  after :all 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 :each do
+    after :all 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 :each do
+  after :all 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 :each do
+  after :all 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 :each do
+  after :all 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 :each do
+  after :all do
     connection.close
   end
 
@@ -37,7 +37,7 @@ describe Bunny::Queue, "NOT bound to an exchange" do
     c
   end
 
-  after :each do
+  after :all 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 :each do
+  after :all 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 :each do
+  after :all 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

@@ -2,7 +2,7 @@
 require "spec_helper"
 
 unless ENV["CI"]
-  describe "TLS connection to RabbitMQ with client certificates" do
+  describe "TLS connection to RabbitMQ" do
     let(:connection) do
       c = Bunny.new(:user     => "bunny_gem",
                     :password => "bunny_password",
@@ -15,7 +15,7 @@ unless ENV["CI"]
       c
     end
 
-    after :each do
+    after :all do
       connection.close
     end
 
@@ -44,88 +44,4 @@ unless ENV["CI"]
       ch.close
     end
   end
-
-
-  describe "TLS connection to RabbitMQ without client certificates" do
-    let(:connection) do
-      c = Bunny.new(:user     => "bunny_gem",
-                    :password => "bunny_password",
-                    :vhost    => "bunny_testbed",
-                    :tls                   => true,
-                    :tls_ca_certificates   => ["./spec/tls/cacert.pem"])
-      c.start
-      c
-    end
-
-    after :each do
-      connection.close
-    end
-
-    it "provides the same API as a regular connection" do
-      ch = connection.create_channel
-
-      q  = ch.queue("", :exclusive => true)
-      x  = ch.default_exchange
-
-      x.publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name)
-
-      sleep 0.5
-      q.message_count.should == 4
-
-      i = 0
-      q.subscribe do |delivery_info, _, payload|
-        i += 1
-      end
-      sleep 1.0
-      i.should == 4
-      q.message_count.should == 0
-
-      ch.close
-    end
-  end
-
-
-  describe "TLS connection to RabbitMQ with a connection string" do
-    let(:connection) do
-      c = Bunny.new("amqps://bunny_gem:bunny_password@127.0.0.1/bunny_testbed",
-        :tls_cert              => "spec/tls/client_cert.pem",
-        :tls_key               => "spec/tls/client_key.pem",
-        :tls_ca_certificates   => ["./spec/tls/cacert.pem"])
-      c.start
-      c
-    end
-
-    after :each do
-      connection.close
-    end
-
-    it "provides the same API as a regular connection" do
-      connection.should be_tls
-      ch = connection.create_channel
-
-      q  = ch.queue("", :exclusive => true)
-      x  = ch.default_exchange
-
-      x.publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name)
-
-      sleep 0.5
-      q.message_count.should == 4
-
-      i = 0
-      q.subscribe do |delivery_info, _, payload|
-        i += 1
-      end
-      sleep 1.0
-      i.should == 4
-      q.message_count.should == 0
-
-      ch.close
-    end
-  end
 end

data/spec/higher_level_api/integration/tx_commit_spec.rb

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

data/spec/unit/concurrent/condition_spec.rb

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