bunny 2.6.3 → 2.6.4

data/spec/higher_level_api/integration/basic_publish_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "Published message" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -15,12 +15,12 @@ describe "Published message" do
     it "routes the messages" do
       ch = connection.create_channel
 
-      q  = ch.queue("", :exclusive => true)
+      q  = ch.queue("", exclusive: true)
       x  = ch.fanout("amq.fanout")
       q.bind(x)
 
       rk = "a" * 254
-      x.publish("xyzzy", :routing_key => rk, :persistent => true)
+      x.publish("xyzzy", routing_key: rk, persistent: true)
 
       sleep(1)
       expect(q.message_count).to eq 1
@@ -37,12 +37,12 @@ describe "Published message" do
     it "routes the messages" do
       ch = connection.create_channel
 
-      q  = ch.queue("", :exclusive => true)
+      q  = ch.queue("", exclusive: true)
       x  = ch.fanout("amq.fanout")
       q.bind(x)
 
       rk = "a" * 255
-      x.publish("xyzzy", :routing_key => rk, :persistent => true)
+      x.publish("xyzzy", routing_key: rk, persistent: true)
 
       sleep(1)
       expect(q.message_count).to eq 1
@@ -59,13 +59,13 @@ describe "Published message" do
     it "fails with a connection exception" do
       ch = connection.create_channel
 
-      q  = ch.queue("", :exclusive => true)
+      q  = ch.queue("", exclusive: true)
       x  = ch.fanout("amq.fanout")
       q.bind(x)
 
       rk = "a" * 256
       expect do
-        x.publish("xyzzy", :routing_key => rk, :persistent => true)
+        x.publish("xyzzy", routing_key: rk, persistent: true)
       end.to raise_error(ArgumentError)
 
       ch.close

data/spec/higher_level_api/integration/basic_qos_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "#prefetch" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end

data/spec/higher_level_api/integration/basic_reject_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "#reject" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -14,13 +14,13 @@ describe Bunny::Channel, "#reject" do
   context "with requeue = true" do
     it "requeues a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.reject.manual-acks", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep(0.5)
       expect(q.message_count).to eq 1
-      delivery_info, _, _ = q.pop(:manual_ack => true)
+      delivery_info, _, _ = q.pop(manual_ack: true)
 
       ch.reject(delivery_info.delivery_tag, true)
       sleep(0.5)
@@ -33,20 +33,20 @@ describe Bunny::Channel, "#reject" do
   context "with requeue = false" do
     it "rejects a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
+      q  = ch.queue("bunny.basic.reject.with-requeue-false", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep(0.5)
       expect(q.message_count).to eq 1
-      delivery_info, _, _ = q.pop(:manual_ack => true)
+      delivery_info, _, _ = q.pop(manual_ack: true)
 
       ch.reject(delivery_info.delivery_tag, false)
       sleep(0.5)
       ch.close
 
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
+      q  = ch.queue("bunny.basic.reject.with-requeue-false", exclusive: true)
       expect(q.message_count).to eq 0
       ch.close
     end
@@ -56,13 +56,13 @@ describe Bunny::Channel, "#reject" do
   context "with an invalid (random) delivery tag" do
     it "causes a channel-level error" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.unknown-delivery-tag", :exclusive => true)
+      q  = ch.queue("bunny.basic.reject.unknown-delivery-tag", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep(0.25)
       expect(q.message_count).to eq 1
-      _, _, content = q.pop(:manual_ack => true)
+      _, _, content = q.pop(manual_ack: true)
 
       ch.on_error do |ch, channel_close|
         @channel_close = channel_close
@@ -78,7 +78,7 @@ end
 
 describe Bunny::Channel, "#basic_reject" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -90,13 +90,13 @@ describe Bunny::Channel, "#basic_reject" do
   context "with requeue = true" do
     it "requeues a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.manual-acks", :exclusive => true)
+      q  = ch.queue("bunny.basic.reject.manual-acks", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep(0.5)
       expect(q.message_count).to eq 1
-      delivery_info, _, _ = q.pop(:manual_ack => true)
+      delivery_info, _, _ = q.pop(manual_ack: true)
 
       ch.basic_reject(delivery_info.delivery_tag.to_i, true)
       sleep(0.5)
@@ -109,20 +109,20 @@ describe Bunny::Channel, "#basic_reject" do
   context "with requeue = false" do
     it "rejects a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
+      q  = ch.queue("bunny.basic.reject.with-requeue-false", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep(0.5)
       expect(q.message_count).to eq 1
-      delivery_info, _, _ = q.pop(:manual_ack => true)
+      delivery_info, _, _ = q.pop(manual_ack: true)
 
       ch.basic_reject(delivery_info.delivery_tag.to_i, false)
       sleep(0.5)
       ch.close
 
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
+      q  = ch.queue("bunny.basic.reject.with-requeue-false", exclusive: true)
       expect(q.message_count).to eq 0
       ch.close
     end
@@ -131,20 +131,20 @@ describe Bunny::Channel, "#basic_reject" do
   context "with requeue = default" do
     it "rejects a message" do
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
+      q  = ch.queue("bunny.basic.reject.with-requeue-false", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep(0.5)
       expect(q.message_count).to eq 1
-      delivery_info, _, _ = q.pop(:manual_ack => true)
+      delivery_info, _, _ = q.pop(manual_ack: true)
 
       ch.basic_reject(delivery_info.delivery_tag.to_i)
       sleep(0.5)
       ch.close
 
       ch = connection.create_channel
-      q  = ch.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
+      q  = ch.queue("bunny.basic.reject.with-requeue-false", exclusive: true)
       expect(q.message_count).to eq 0
       ch.close
     end

data/spec/higher_level_api/integration/basic_return_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Exchange, "#publish" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -12,7 +12,7 @@ describe Bunny::Exchange, "#publish" do
   end
 
 
-  context "with :mandatory => true and a bad [no routes] routing key" do
+  context "with mandatory: true and a bad [no routes] routing key" do
     it "causes a message to be returned" do
       ch = connection.create_channel
       x  = ch.default_exchange
@@ -22,7 +22,7 @@ describe Bunny::Exchange, "#publish" do
         returned << content
       end
 
-      x.publish("xyzzy", :routing_key => rand.to_s, :mandatory => true)
+      x.publish("xyzzy", routing_key: rand.to_s, mandatory: true)
       sleep 0.5
 
       expect(returned).to include("xyzzy")

data/spec/higher_level_api/integration/channel_close_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "when closed" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end

data/spec/higher_level_api/integration/channel_open_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "when opened" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end

data/spec/higher_level_api/integration/connection_recovery_spec.rb

@@ -3,27 +3,27 @@ require "rabbitmq/http/client"
 
 describe "Connection recovery" do
   let(:http_client) { RabbitMQ::HTTP::Client.new("http://127.0.0.1:15672") }
-  let(:logger) { Logger.new($stderr).tap {|logger| logger.level = Logger::FATAL} }
+  let(:logger) { Logger.new($stderr).tap {|logger| logger.level = ENV["BUNNY_LOG_LEVEL"] || Logger::WARN } }
   let(:recovery_interval) { 0.2 }
 
   it "reconnects after grace period" do
     with_open do |c|
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      wait_for_recovery_with { connections.any? }
     end
   end
 
   it "reconnects after grace period (with multiple hosts)" do
     with_open_multi_host do |c|
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      wait_for_recovery_with { connections.any? }
     end
   end
 
   it "reconnects after grace period (with multiple hosts, including a broken one)" do
     with_open_multi_broken_host do |c|
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      wait_for_recovery_with { connections.any? }
     end
   end
 
@@ -31,8 +31,9 @@ describe "Connection recovery" do
     with_open do |c|
       ch1 = c.create_channel
       ch2 = c.create_channel
+      sleep 1.5
       close_all_connections!
-      poll_until { channels.count.zero? }
+      sleep 0.5
       poll_until { channels.count == 2 }
       expect(ch1).to be_open
       expect(ch2).to be_open
@@ -43,8 +44,9 @@ describe "Connection recovery" do
     with_open_multi_host do |c|
       ch1 = c.create_channel
       ch2 = c.create_channel
+      sleep 1.5
       close_all_connections!
-      poll_until { channels.count.zero? }
+      sleep 0.5
       poll_until { channels.count == 2 }
       expect(ch1).to be_open
       expect(ch2).to be_open
@@ -55,8 +57,9 @@ describe "Connection recovery" do
     with_open_multi_broken_host do |c|
       ch1 = c.create_channel
       ch2 = c.create_channel
+      sleep 1.5
       close_all_connections!
-      poll_until { channels.count.zero? }
+      sleep 0.5
       poll_until { channels.count == 2 }
       expect(ch1).to be_open
       expect(ch2).to be_open
@@ -69,8 +72,10 @@ describe "Connection recovery" do
       ch.prefetch(11)
       expect(ch.prefetch_count).to eq 11
       expect(ch.prefetch_global).to be false
+      sleep 1.5
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      sleep 0.5
+      wait_for_recovery_with { connections.any? }
       expect(ch).to be_open
       expect(ch.prefetch_count).to eq 11
       expect(ch.prefetch_global).to be false
@@ -83,8 +88,10 @@ describe "Connection recovery" do
       ch.prefetch(42, true)
       expect(ch.prefetch_count).to eq 42
       expect(ch.prefetch_global).to be true
+      sleep 1.5
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      sleep 0.5
+      wait_for_recovery_with { connections.any? }
       expect(ch).to be_open
       expect(ch.prefetch_count).to eq 42
       expect(ch.prefetch_global).to be true
@@ -96,8 +103,10 @@ describe "Connection recovery" do
       ch = c.create_channel
       ch.confirm_select
       expect(ch).to be_using_publisher_confirms
+      sleep 1.5
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      sleep 0.5
+      wait_for_recovery_with { connections.any? }
       expect(ch).to be_open
       expect(ch).to be_using_publisher_confirms
     end
@@ -108,8 +117,10 @@ describe "Connection recovery" do
       ch = c.create_channel
       ch.tx_select
       expect(ch).to be_using_tx
+      sleep 1.5
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      sleep 0.5
+      wait_for_recovery_with { connections.any? }
       expect(ch).to be_open
       expect(ch).to be_using_tx
     end
@@ -120,15 +131,15 @@ describe "Connection recovery" do
       ch = c.create_channel
       q  = ch.queue("bunny.tests.recovery.client-named#{rand}")
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      wait_for_recovery_with { connections.any? }
       expect(ch).to be_open
       ensure_queue_recovery(ch, q)
       q.delete
     end
   end
 
-  # a very simplistic test for queues inspired by #412
-  it "recovers client-named queues declared with passive = true" do
+  # a very simplistic test for queues inspired by #422
+  it "recovers client-named queues declared with no_declare: true" do
     with_open do |c|
       ch  = c.create_channel
       ch2 = c.create_channel
@@ -140,20 +151,40 @@ describe "Connection recovery" do
       q2  = ch2.queue(s, no_declare: true)
 
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      wait_for_recovery_with { connections.any? }
       expect(ch).to be_open
       ensure_queue_recovery(ch, q)
       q.delete
     end
   end
 
+  # a test for #422
+  it "recovers client-named queues declared with passive: true" do
+    with_open do |c|
+      ch  = c.create_channel
+      ch2 = c.create_channel
+
+      n   = rand
+      s   = "bunny.tests.recovery.client-named#{n}"
+
+      q   = ch.queue(s)
+      q2  = ch2.queue(s, passive: true)
+
+      close_all_connections!
+      wait_for_recovery_with { connections.any? }
+      expect(ch).to be_open
+      ensure_queue_recovery(ch, q)
+      ensure_queue_recovery(ch, q2)
+      q.delete
+    end
+  end
 
   it "recovers server-named queues" do
     with_open do |c|
       ch = c.create_channel
-      q  = ch.queue("", :exclusive => true)
+      q  = ch.queue("", exclusive: true)
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      wait_for_recovery_with { connections.any? }
       expect(ch).to be_open
       ensure_queue_recovery(ch, q)
     end
@@ -163,10 +194,10 @@ describe "Connection recovery" do
     with_open do |c|
       ch = c.create_channel
       x  = ch.fanout("amq.fanout")
-      q  = ch.queue("", :exclusive => true)
+      q  = ch.queue("", exclusive: true)
       q.bind(x)
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      wait_for_recovery_with { connections.any? }
       expect(ch).to be_open
       ensure_queue_binding_recovery(ch, x, q)
     end
@@ -190,13 +221,43 @@ describe "Connection recovery" do
 
       close_all_connections!
 
-      wait_on_loss_and_recovery_of { exchange_names_in_vhost("/").include?(source.name) }
+      wait_for_recovery_with { exchange_names_in_vhost("/").include?(source.name) }
+      ch.confirm_select
 
+      source.publish("msg", routing_key: "")
+      ch.wait_for_confirms
+      expect(dst_queue.message_count).to eq 1
+      destination.delete
+    end
+  end
+
+  it "recovers passively declared exchanges and their bindings" do
+    with_open do |c|
+      ch          = c.create_channel
       ch.confirm_select
 
+      source      = ch.fanout("amq.fanout", passive: true)
+      destination = ch.fanout("destination.exchange.recovery.example", auto_delete: true)
+
+      destination.bind(source)
+
+      # Exchanges won't get auto-deleted on connection loss unless they have
+      # had an exclusive queue bound to them.
+      dst_queue   = ch.queue("", exclusive: true)
+      dst_queue.bind(destination, routing_key: "")
+
+      src_queue   = ch.queue("", exclusive: true)
+      src_queue.bind(source, routing_key: "")
+
+      close_all_connections!
+
+      wait_for_recovery_with { connections.any? }
+
       source.publish("msg", routing_key: "")
       ch.wait_for_confirms
+
       expect(dst_queue.message_count).to eq 1
+      destination.delete
     end
   end
 
@@ -223,7 +284,7 @@ describe "Connection recovery" do
 
       close_all_connections!
 
-      wait_on_loss_and_recovery_of { exchange_names_in_vhost("/").include?(source.name) }
+      wait_for_recovery_with { exchange_names_in_vhost("/").include?(source.name) }
 
       ch2.confirm_select
 
@@ -239,7 +300,7 @@ describe "Connection recovery" do
       10.times { c.create_channel }
       expect(c.queue_exists?(q)).to eq false
       close_all_connections!
-      wait_on_loss_and_recovery_of { channels.any? }
+      wait_for_recovery_with { channels.any? }
       # make sure the connection isn't closed shortly after
       # due to "second 'channel.open' seen". MK.
       expect(c).to be_open
@@ -255,12 +316,12 @@ describe "Connection recovery" do
       delivered = false
 
       ch = c.create_channel
-      q  = ch.queue("", :exclusive => true)
+      q  = ch.queue("", exclusive: true)
       q.subscribe do |_, _, _|
         delivered = true
       end
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      wait_for_recovery_with { connections.any? }
       expect(ch).to be_open
 
       q.publish("")
@@ -274,10 +335,10 @@ describe "Connection recovery" do
 
     with_open do |c|
       ch = c.create_channel
-      q  = ch.queue("", :exclusive => true)
+      q  = ch.queue("", exclusive: true)
       n.times { q.subscribe { |_, _, _| } }
       close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
+      wait_for_recovery_with { connections.any? }
       expect(ch).to be_open
       sleep 0.5
 
@@ -294,34 +355,19 @@ describe "Connection recovery" do
       ch = c.create_channel
 
       n.times do
-        qs << ch.queue("", :exclusive => true)
+        qs << ch.queue("", exclusive: true)
       end
       close_all_connections!
-      wait_on_loss_and_recovery_of { queue_names.include?(qs.first.name) }
+      wait_for_recovery_with { queue_names.include?(qs.first.name) }
       sleep 0.5
       expect(ch).to be_open
 
       qs.each do |q|
-        ch.queue_declare(q.name, :passive => true)
+        ch.queue_declare(q.name, passive: true)
       end
     end
   end
 
-  it "tries to recover for a given number of attempts" do
-    pending "Need a fix for https://github.com/ruby-amqp/bunny/issues/408"
-    with_recovery_attempts_limited_to(2) do |c|
-      close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
-
-      close_all_connections!
-      wait_on_loss_and_recovery_of { connections.any? }
-
-      close_all_connections!
-      sleep(recovery_interval + 0.5)
-      expect(connections).to be_empty
-    end
-  end
-
   def exchange_names_in_vhost(vhost)
     http_client.list_exchanges(vhost).map {|e| e["name"]}
   end
@@ -346,11 +392,11 @@ describe "Connection recovery" do
 
   def close_ignoring_permitted_exceptions(connection_name)
     http_client.close_connection(connection_name)
-  rescue Bunny::ConnectionForced
+  rescue Bunny::ConnectionForced, Faraday::ResourceNotFound
+    # ignored
   end
 
-  def wait_on_loss_and_recovery_of(&probe)
-    poll_while &probe
+  def wait_for_recovery_with(&probe)
     poll_until &probe
   end
 
@@ -392,14 +438,6 @@ describe "Connection recovery" do
     with_open(c, &block)
   end
 
-  def with_recovery_attempts_limited_to(attempts = 3, &block)
-    c = Bunny.new(recover_from_connection_close: true,
-                  network_recovery_interval: recovery_interval,
-                  recovery_attempts: attempts,
-                  logger: logger)
-    with_open(c, &block)
-  end
-
   def ensure_queue_recovery(ch, q)
     ch.confirm_select
     q.purge