bunny 2.14.4 → 2.19.0

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -62,8 +62,10 @@ describe Bunny::Queue, "#subscribe" do
           x.publish("hello", routing_key: queue_name)
         end
 
-        sleep 1.0
-        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
+        sleep 1.5
+        100.times do |i|
+          expect(delivery_tags).to include(i + 1)
+        end
 
         expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
@@ -95,7 +97,9 @@ describe Bunny::Queue, "#subscribe" do
         end
 
         sleep 1.5
-        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
+        100.times do |i|
+          expect(delivery_tags).to include(i + 1)
+        end
 
         expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
@@ -189,17 +193,17 @@ describe Bunny::Queue, "#subscribe" do
         ch = connection.create_channel
         q  = ch.queue(queue_name)
 
-        c1  = q.subscribe(exclusive: false, manual_ack: false, block: false) do |delivery_info, properties, payload|
+        c1  = q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
         end
         c1.cancel
 
-        c2  = q.subscribe(exclusive: false, manual_ack: false, block: false) do |delivery_info, properties, payload|
+        c2  = q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end
         c2.cancel
 
-        q.subscribe(exclusive: false, manual_ack: false, block: true) do |delivery_info, properties, payload|
+        q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end
@@ -305,8 +309,10 @@ describe Bunny::Queue, "#subscribe" do
           x.publish("hello", routing_key: queue_name)
         end
 
-        sleep 1.0
-        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
+        sleep 1.5
+        100.times do |i|
+          expect(delivery_tags).to include(i + 1)
+        end
 
         expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
@@ -338,7 +344,9 @@ describe Bunny::Queue, "#subscribe" do
         end
 
         sleep 1.5
-        expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
+        100.times do |i|
+          expect(delivery_tags).to include(i + 1)
+        end
 
         expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 

data/spec/higher_level_api/integration/connection_spec.rb

@@ -560,4 +560,30 @@ describe Bunny::Session do
       described_class.new(logger: logger)
     end
   end
+
+  context "initialized with a custom connection name" do
+    it "uses provided connection name with default connection string" do
+      conn = Bunny.new(connection_name: 'test_name')
+
+      expect(conn.connection_name).to eq 'test_name'
+    end
+
+    it "uses provided connection name from client property hash" do
+      conn = Bunny.new(client_properties: {connection_name: 'cp/test_name'})
+
+      expect(conn.connection_name).to eq 'cp/test_name'
+    end
+
+    it "uses provided connection name with custom connection string" do
+      conn = Bunny.new('amqp://guest:guest@rabbitmq:5672', connection_name: 'test_name3')
+
+      expect(conn.connection_name).to eq 'test_name3'
+    end
+
+    it "uses provided connection name with hash options" do
+      conn = Bunny.new(user: 'user', password: 'p455w0rd', connection_name: 'test_name4')
+
+      expect(conn.connection_name).to eq 'test_name4'
+    end
+  end
 end

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -3,248 +3,253 @@ require "spec_helper"
 
 require "socket"
 
-unless ENV["CI"]
-  CERTIFICATE_DIR = ENV.fetch("BUNNY_CERTIFICATE_DIR", "./spec/tls")
-  puts "Will use certificates from #{CERTIFICATE_DIR}"
-
-  shared_examples_for "successful TLS connection" do
-    it "succeeds" do
-      expect(subject).to be_tls
-      ch = subject.create_channel
-      ch.confirm_select
-
-      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)
-
-      x.wait_for_confirms
-      expect(q.message_count).to eq 4
-
-      i = 0
-      q.subscribe do |delivery_info, _, payload|
-        i += 1
-      end
-      sleep 1.0
-      expect(i).to eq 4
-      expect(q.message_count).to eq 0
-
-      ch.close
-    end
-  end
+CERTIFICATE_DIR = ENV.fetch("BUNNY_CERTIFICATE_DIR", "./spec/tls")
+puts "Will use certificates from #{CERTIFICATE_DIR}"
 
-  def local_hostname
-    ENV.fetch("BUNNY_RABBITMQ_HOSTNAME", "localhost")
-  end
-
-  context "initialized with :tls => true" do
-    let(:subject) do
-      Bunny.new(
-        hostname:  local_hostname(),
-        user:     "bunny_gem",
-        password: "bunny_password",
-        vhost:    "bunny_testbed",
-        tls: true,
-        verify_peer: verify_peer,
-        tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
-        tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"])
-    end
+shared_examples_for "successful TLS connection" do
+  it "succeeds", skip: ENV["CI"] do
+    expect(subject).to be_tls
+    ch = subject.create_channel
+    ch.confirm_select
 
-    context "peer verification is off" do
-      let(:verify_peer) { false }
+    q  = ch.queue("", exclusive: true)
+    x  = ch.default_exchange
 
-      it "uses TLS port" do
-        expect(subject.port).to eq AMQ::Protocol::TLS_PORT
-      end
+    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)
 
-      it "sends the SNI details" do
-        # https://github.com/ruby-amqp/bunny/issues/440
-        subject.start
-        expect(subject.transport.socket.hostname).to_not be_empty
-      end
+    x.wait_for_confirms
+    expect(q.message_count).to eq 4
 
-      after :each do
-        subject.close
-      end
+    i = 0
+    q.subscribe do |delivery_info, _, payload|
+      i += 1
     end
+    sleep 1.0
+    expect(i).to eq 4
+    expect(q.message_count).to eq 0
 
-    context "peer verification is on" do
-      let(:verify_peer) { true }
+    ch.close
+  end
+end
 
-      it "uses TLS port" do
-        expect(subject.port).to eq AMQ::Protocol::TLS_PORT
-      end
-    end
+def local_hostname
+  ENV.fetch("BUNNY_RABBITMQ_HOSTNAME", "localhost")
+end
+
+context "initialized with tls: true", skip: ENV["CI"] do
+  let(:subject) do
+    Bunny.new(
+      hostname:  local_hostname(),
+      user:     "bunny_gem",
+      password: "bunny_password",
+      vhost:    "bunny_testbed",
+      tls: true,
+      verify_peer: verify_peer,
+      tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
+      tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"])
   end
 
-  describe "TLS connection to RabbitMQ with client certificates" do
-    let(:subject) do
-      c = Bunny.new(
-        hostname: local_hostname(),
-        username: "bunny_gem",
-        password: "bunny_password",
-        vhost: "bunny_testbed",
-        tls: true,
-        tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
-        tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: false)
-      c.start
-      c
+  context "peer verification is off" do
+    let(:verify_peer) { false }
+
+    it "uses TLS port" do
+      expect(subject.port).to eq AMQ::Protocol::TLS_PORT
+    end
+
+    it "sends the SNI details" do
+      # https://github.com/ruby-amqp/bunny/issues/440
+      subject.start
+      expect(subject.transport.socket.hostname).to_not be_empty
     end
 
     after :each do
       subject.close
     end
-
-    include_examples "successful TLS connection"
   end
 
+  context "peer verification is on" do
+    let(:verify_peer) { true }
 
-  describe "TLS connection to RabbitMQ without client certificates" do
-    let(:subject) do
-      c = Bunny.new(
-        hostname: local_hostname(),
-        username: "bunny_gem",
-        password: "bunny_password",
-        vhost: "bunny_testbed",
-        tls: true,
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: false)
-      c.start
-      c
+    it "uses TLS port" do
+      expect(subject.port).to eq AMQ::Protocol::TLS_PORT
     end
+  end
+end
 
-    after :each do
-      subject.close
-    end
+describe "TLS connection to RabbitMQ with client certificates", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new(
+      hostname: local_hostname(),
+      username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      tls: true,
+      tls_protocol: :TLSv1_2,
+      tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
+      tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
 
-    include_examples "successful TLS connection"
+  after :each do
+    subject.close
   end
 
+  include_examples "successful TLS connection"
+end
 
-  describe "TLS connection to RabbitMQ with a connection string" do
-    let(:subject) do
-      c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
-        tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
-        tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: false)
-      c.start
-      c
-    end
 
-    after :each do
-      subject.close
-    end
+describe "TLS connection to RabbitMQ without client certificates", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new(
+      hostname: local_hostname(),
+      username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      tls: true,
+      tls_protocol: :TLSv1_2,
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
 
-    include_examples "successful TLS connection"
+  after :each do
+    subject.close
+  end
 
-    context "when URI contains query parameters" do
-      subject(:session) do
-        Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed?heartbeat=10&connection_timeout=100&channel_max=1000&verify=false&cacertfile=#{CERTIFICATE_DIR}/ca_certificate.pem&certfile=#{CERTIFICATE_DIR}/client_certificate.pem&keyfile=#{CERTIFICATE_DIR}/client_key.pem")
-      end
+  include_examples "successful TLS connection"
+end
 
-      it "parses extra connection parameters" do
-        session.start
 
-        expect(session.uses_tls?).to eq(true)
-        expect(session.transport.verify_peer).to eq(false)
-        expect(session.transport.tls_ca_certificates).to eq(["#{CERTIFICATE_DIR}/ca_certificate.pem"])
-        expect(session.transport.tls_certificate_path).to eq("#{CERTIFICATE_DIR}/client_certificate.pem")
-        expect(session.transport.tls_key_path).to eq("#{CERTIFICATE_DIR}/client_key.pem")
-      end
-    end
+describe "TLS connection to RabbitMQ with a connection string", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
+      tls_protocol: :TLSv1_2,
+      tls_cert: "#{CERTIFICATE_DIR}/client_certificate.pem",
+      tls_key: "#{CERTIFICATE_DIR}/client_key.pem",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      verify_peer: false)
+    c.start
+    c
+  end
+
+  after :each do
+    subject.close
   end
 
+  include_examples "successful TLS connection"
 
-  describe "TLS connection to RabbitMQ with a connection string and w/o client certificate and key" do
-    let(:subject) do
-      c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: verify_peer)
-      c.start
-      c
+  context "when URI contains query parameters" do
+    subject(:session) do
+      Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed?heartbeat=10&connection_timeout=100&channel_max=1000&verify=false&cacertfile=#{CERTIFICATE_DIR}/ca_certificate.pem&certfile=#{CERTIFICATE_DIR}/client_certificate.pem&keyfile=#{CERTIFICATE_DIR}/client_key.pem")
     end
 
-    after :each do
-      subject.close
+    it "parses extra connection parameters" do
+      session.start
+
+      expect(session.uses_tls?).to eq(true)
+      expect(session.transport.verify_peer).to eq(false)
+      expect(session.transport.tls_ca_certificates).to eq(["#{CERTIFICATE_DIR}/ca_certificate.pem"])
+      expect(session.transport.tls_certificate_path).to eq("#{CERTIFICATE_DIR}/client_certificate.pem")
+      expect(session.transport.tls_key_path).to eq("#{CERTIFICATE_DIR}/client_key.pem")
     end
+  end
+end
 
-    context "peer verification is off" do
-      let(:verify_peer) { false }
 
-      include_examples "successful TLS connection"
+describe "TLS connection to RabbitMQ with a connection string and w/o client certificate and key", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      tls_protocol: :TLSv1_2,
+      verify_peer: verify_peer)
+    c.start
+    c
+  end
 
-      it "sends the SNI details" do
-        # https://github.com/ruby-amqp/bunny/issues/440
-        expect(subject.transport.socket.hostname).to_not be_empty
-      end
-    end
+  after :each do
+    subject.close
+  end
 
-    context "peer verification is on" do
-      let(:verify_peer) { true }
+  context "peer verification is off" do
+    let(:verify_peer) { false }
 
-      include_examples "successful TLS connection"
+    include_examples "successful TLS connection"
 
-      it "sends the SNI details" do
-        # https://github.com/ruby-amqp/bunny/issues/440
-        expect(subject.transport.socket.hostname).to_not be_empty
-      end
+    it "sends the SNI details" do
+      # https://github.com/ruby-amqp/bunny/issues/440
+      expect(subject.transport.socket.hostname).to_not be_empty
     end
   end
 
+  context "peer verification is on" do
+    let(:verify_peer) { true }
 
-  describe "TLS connection to RabbitMQ with client certificates provided inline" do
-    let(:subject) do
-      c = Bunny.new(
-        hostname: local_hostname(),
-        username: "bunny_gem",
-        password: "bunny_password",
-        vhost: "bunny_testbed",
-        tls: true,
-        tls_cert: File.read("#{CERTIFICATE_DIR}/client_certificate.pem"),
-        tls_key: File.read("#{CERTIFICATE_DIR}/client_key.pem"),
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: false)
-      c.start
-      c
-    end
+    include_examples "successful TLS connection"
 
-    after :each do
-      subject.close
+    it "sends the SNI details" do
+      # https://github.com/ruby-amqp/bunny/issues/440
+      expect(subject.transport.socket.hostname).to_not be_empty
     end
+  end
+end
 
-    include_examples "successful TLS connection"
+describe "TLS connection to RabbitMQ w/o client certificate", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new("amqps://bunny_gem:bunny_password@#{local_hostname()}/bunny_testbed",
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      tls_protocol: :TLSv1_2,
+      verify_peer: false,
+      tls_silence_warnings: should_silence_warnings)
+    c.start
+    c
   end
 
-  describe "TLS connection to RabbitMQ with tls_version TLSv1.1 specified" do
-    let(:subject) do
-      c = Bunny.new(
-        hostname: local_hostname(),
-        username: "bunny_gem",
-        password: "bunny_password",
-        vhost: "bunny_testbed",
-        tls: true,
-        tls_protocol: :TLSv1_1,
-        tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
-        verify_peer: false)
-      c.start
-      c
-    end
+  after :each do
+    subject.close
+  end
 
-    after :each do
-      subject.close
-    end
+  context "TLS-related warnings are enabled" do
+    let(:should_silence_warnings) { false }
 
     include_examples "successful TLS connection"
+  end
 
-    it "connects using TLSv1.1" do
-      expect(subject.transport.socket.ssl_version).to eq "TLSv1.1"
-    end
+  context "TLS-related warnings are silenced" do
+    let(:should_silence_warnings) { true }
+
+    include_examples "successful TLS connection"
+  end
+end
+
+
+describe "TLS connection to RabbitMQ with client certificates provided inline", skip: ENV["CI"] do
+  let(:subject) do
+    c = Bunny.new(
+      hostname: local_hostname(),
+      username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      tls: true,
+      tls_cert: File.read("#{CERTIFICATE_DIR}/client_certificate.pem"),
+      tls_key: File.read("#{CERTIFICATE_DIR}/client_key.pem"),
+      tls_ca_certificates: ["#{CERTIFICATE_DIR}/ca_certificate.pem"],
+      tls_protocol: :TLSv1_2,
+      verify_peer: false)
+    c.start
+    c
+  end
+
+  after :each do
+    subject.close
   end
+
+  include_examples "successful TLS connection"
 end