bunny 1.3.0 → 2.17.0

data/spec/stress/channel_open_stress_spec.rb

@@ -1,18 +1,24 @@
 require "spec_helper"
 
 describe "Rapidly opening and closing lots of channels" do
-  connection = Bunny.new(:automatic_recovery => false).tap do |c|
-    c.start
+  before :all do
+    @connection = Bunny.new(automatic_recovery: false).tap do |c|
+      c.start
+    end
+  end
+
+  after :all do
+    @connection.close
   end
 
   context "in a single-threaded scenario" do
     let(:n) { 500 }
 
     it "works correctly" do
-      xs = Array.new(n) { connection.create_channel }
+      xs = Array.new(n) { @connection.create_channel }
       puts "Opened #{n} channels"
 
-      xs.size.should == n
+      expect(xs.size).to eq n
       xs.each do |ch|
         ch.close
       end
@@ -35,12 +41,12 @@ describe "Rapidly opening and closing lots of channels" do
 
         n.times do
           t = Thread.new do
-            ch1 = connection.create_channel
-            q   = ch1.queue("", :exclusive => true)
+            ch1 = @connection.create_channel
+            q   = ch1.queue("", exclusive: true)
             q.delete
             ch1.close
 
-            ch2 = connection.create_channel
+            ch2 = @connection.create_channel
             ch2.close
           end
           t.abort_on_exception = true
@@ -62,8 +68,8 @@ describe "Rapidly opening and closing lots of channels" do
         n.times do
           t = Thread.new do
             3.times do
-              ch = connection.create_channel
-              x  = ch.topic('bunny.stress.topics.t2', :durable => false)
+              ch = @connection.create_channel
+              x  = ch.topic('bunny.stress.topics.t2', durable: false)
               ch.close
             end
           end

data/spec/stress/channel_open_stress_with_single_threaded_connection_spec.rb

@@ -2,23 +2,23 @@ require "spec_helper"
 
 unless ENV["CI"]
   describe "Rapidly opening and closing lots of channels on a non-threaded connection" do
-    let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatic_recovery => false, :threaded => false)
-      c.start
-      c
+    before :all do
+      @connection = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
+        automatic_recovery: false, threaded: false)
+      @connection.start
     end
 
     after :all do
-      connection.close
+      @connection.close
     end
 
     context "in a single-threaded scenario" do
       let(:n) { 500 }
 
       it "works correctly" do
-        xs = Array.new(n) { connection.create_channel }
+        xs = Array.new(n) { @connection.create_channel }
 
-        xs.size.should == n
+        expect(xs.size).to eq n
         xs.each do |ch|
           ch.close
         end

data/spec/stress/concurrent_consumers_stress_spec.rb

@@ -3,15 +3,14 @@ require "spec_helper"
 
 unless ENV["CI"]
   describe "Concurrent consumers sharing a connection" do
-    let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed",
-                    :automatic_recovery => false, :continuation_timeout => 6000)
-      c.start
-      c
+    before :all do
+      @connection = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
+                    automatic_recovery: false, continuation_timeout: 45000)
+      @connection.start
     end
 
     after :all do
-      connection.close
+      @connection.close
     end
 
     def any_not_drained?(qs)
@@ -21,17 +20,18 @@ unless ENV["CI"]
     context "when publishing thousands of messages over 128K in size" do
       let(:colors) { ["red", "blue", "white"] }
 
-      let(:n) { 32 }
-      let(:m) { 1000 }
+      let(:n) { 16 }
+      let(:m) { 5000 }
 
       it "successfully drain all queues" do
-        ch   = connection.create_channel
+        ch0  = @connection.create_channel
+        ch0.confirm_select
         body = "абвг"
-        x    = ch.topic("bunny.stress.concurrent.consumers.topic", :durable => true)
+        x    = ch0.topic("bunny.stress.concurrent.consumers.topic", durable: true)
 
         chs  = {}
         n.times do |i|
-          chs[i] = connection.create_channel
+          chs[i] = @connection.create_channel
         end
         qs   = []
 
@@ -39,8 +39,8 @@ unless ENV["CI"]
           t = Thread.new do
             cht = chs[i]
 
-            q = cht.queue("", :exclusive => true)
-            q.bind(x.name, :routing_key => colors.sample).subscribe do |delivery_info, meta, payload|
+            q = cht.queue("", exclusive: true)
+            q.bind(x.name, routing_key: colors.sample).subscribe do |delivery_info, meta, payload|
               # no-op
             end
             qs << q
@@ -52,17 +52,19 @@ unless ENV["CI"]
 
         5.times do |i|
           m.times do
-            x.publish(body, :routing_key => colors.sample)
+            x.publish(body, routing_key: colors.sample)
           end
           puts "Published #{(i + 1) * m} messages..."
+          ch0.wait_for_confirms
         end
 
         while any_not_drained?(qs)
           sleep 1.0
         end
-        puts "Drained all the queues..."
+        puts "Drained all queues, winding down..."
 
-        ch.close
+        ch0.close
+        chs.each { |_, ch| ch.close }
       end
     end
   end

data/spec/stress/concurrent_publishers_stress_spec.rb

@@ -3,31 +3,27 @@ require "spec_helper"
 
 unless ENV["CI"]
   describe "Concurrent publishers sharing a connection" do
-    let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatically_recover => false, :continuation_timeout => 20.0)
-      c.start
-      c
+    before :all do
+      @connection = Bunny.new(username: "bunny_gem", password: "bunny_password",
+        vhost: "bunny_testbed", automatically_recover: false)
+      @connection.start
     end
 
     after :all do
-      connection.close
+      @connection.close
     end
 
     let(:concurrency) { 24 }
-    let(:rate)        { 5_000 }
+    let(:messages)    { 5_000 }
 
     it "successfully finish publishing" do
-      ch = connection.create_channel
-
-      q    = ch.queue("", :exclusive => true)
       body = "сообщение"
 
-      # let the queue name be sent back by RabbitMQ
-      sleep 0.25
-
       chs  = {}
       concurrency.times do |i|
-        chs[i] = connection.create_channel
+        ch     = @connection.create_channel
+        ch.confirm_select
+        chs[i] = ch
       end
 
       ts = []
@@ -35,14 +31,13 @@ unless ENV["CI"]
       concurrency.times do |i|
         t = Thread.new do
           cht = chs[i]
-          x   = ch.default_exchange
+          x   = cht.default_exchange
 
-          5.times do |i|
-            rate.times do
-              x.publish(body, :routing_key => q.name)
-            end
-            puts "Published #{(i + 1) * rate} messages..."
+          messages.times do
+            x.publish(body)
           end
+          puts "Published #{messages} messages..."
+          cht.wait_for_confirms
         end
         t.abort_on_exception = true
 
@@ -52,6 +47,8 @@ unless ENV["CI"]
       ts.each do |t|
         t.join
       end
+
+      chs.each { |_, ch| ch.close }
     end
   end
 end

data/spec/stress/connection_open_close_spec.rb

@@ -13,38 +13,38 @@ unless defined?(JRUBY_VERSION) && !ENV["FORCE_JRUBY_RUN"]
 
     n.times do |i|
       it "can be closed (automatic recovery disabled, take #{i})" do
-        c  = Bunny.new(:automatically_recover => false)
+        c  = Bunny.new(automatically_recover: false)
         c.start
         ch = c.create_channel
 
-        c.should be_connected
+        expect(c).to be_connected
         c.stop
-        c.should be_closed
+        expect(c).to be_closed
       end
     end
 
     n.times do |i|
       it "can be closed (automatic recovery enabled, take #{i})" do
-        c  = Bunny.new(:automatically_recover => true)
+        c  = Bunny.new(automatically_recover: true)
         c.start
         ch = c.create_channel
 
-        c.should be_connected
+        expect(c).to be_connected
         c.stop
-        c.should be_closed
+        expect(c).to be_closed
       end
     end
 
     context "in the single threaded mode" do
       n.times do |i|
         it "can be closed (single threaded mode, take #{i})" do
-          c  = Bunny.new(:automatically_recover => false, :threaded => false)
+          c  = Bunny.new(automatically_recover: false, threaded: false)
           c.start
           ch = c.create_channel
 
-          c.should be_connected
+          expect(c).to be_connected
           c.stop
-          c.should be_closed
+          expect(c).to be_closed
         end
       end
     end

data/spec/stress/merry_go_round_spec.rb

@@ -0,0 +1,105 @@
+require "spec_helper"
+
+describe "A batch of messages proxied by multiple intermediate consumers" do
+  let(:c1) do
+    c = Bunny.new(username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      heartbeat_timeout: 6)
+    c.start
+    c
+  end
+
+  let(:c2) do
+    c = Bunny.new(username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      heartbeat_timeout: 6)
+    c.start
+    c
+  end
+
+  let(:c3) do
+    c = Bunny.new(username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      heartbeat_timeout: 6)
+    c.start
+    c
+  end
+
+  let(:c4) do
+    c = Bunny.new(username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      heartbeat_timeout: 6)
+    c.start
+    c
+  end
+
+  let(:c5) do
+    c = Bunny.new(username: "bunny_gem",
+      password: "bunny_password",
+      vhost: "bunny_testbed",
+      heartbeat_timeout: 6)
+    c.start
+    c
+  end
+
+  after :each do
+    [c1, c2, c3, c4, c5].each do |c|
+      c.close if c.open?
+    end
+  end
+
+  [1000, 5_000, 10_000, 20_000, 30_000, 50_000].each do |n|
+    # message flow is as follows:
+    #
+    # x => q4 => q3 => q2 => q1 => xs (results)
+    it "successfully reaches its final destination (batch size: #{n})" do
+      xs  = []
+
+      ch1 = c1.create_channel
+      q1  = ch1.queue("", exclusive: true)
+      q1.subscribe(manual_ack: true) do |delivery_info, _, payload|
+        xs << payload
+        ch1.ack(delivery_info.delivery_tag)
+      end
+
+      ch2 = c2.create_channel
+      q2  = ch2.queue("", exclusive: true)
+      q2.subscribe do |_, _, payload|
+        q1.publish(payload)
+      end
+
+      ch3 = c3.create_channel(nil, 2)
+      q3  = ch3.queue("", exclusive: true)
+      q3.subscribe(manual_ack: true) do |delivery_info, _, payload|
+        q2.publish(payload)
+        ch3.ack(delivery_info.delivery_tag)
+      end
+
+      ch4 = c4.create_channel(nil, 4)
+      q4  = ch4.queue("", exclusive: true)
+      q4.subscribe do |_, _, payload|
+        q3.publish(payload)
+      end
+
+      ch5 = c5.create_channel(nil, 8)
+      x   = ch5.default_exchange
+
+      n.times do |i|
+        x.publish("msg #{i}", routing_key: q4.name)
+      end
+
+      Bunny::TestKit.poll_until(90) do
+        xs.size >= n
+      end
+
+      expect(xs.size).to eq n
+      expect(xs.last).to eq "msg #{n - 1}"
+
+      [q1, q2, q3, q4].each { |q| q.delete }
+    end
+  end
+end

data/spec/tls/client_key.pem

@@ -1,27 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----