bunny 2.6.3 → 2.6.4

data/spec/stress/long_running_consumer_spec.rb

@@ -7,7 +7,9 @@ unless ENV["CI"]
 
   describe "Long running [relatively to heartbeat interval] consumer that never publishes" do
     before :all do
-      @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatic_recovery => false, :heartbeat_interval => 6)
+      @connection = Bunny.new(username: "bunny_gem",
+        password: "bunny_password", vhost: "bunny_testbed",
+        automatic_recovery: false, heartbeat_interval: 6)
       @connection.start
     end
 
@@ -15,7 +17,7 @@ unless ENV["CI"]
       @connection.close
     end
 
-    let(:target) { 512 * 1024 * 1024 }
+    let(:target) { 256 * 1024 * 1024 }
     let(:queue)  { "bunny.stress.long_running_consumer.#{Time.now.to_i}" }
 
     let(:rate) { 50 }
@@ -30,7 +32,7 @@ unless ENV["CI"]
         t  = 0
         ch = @connection.create_channel(nil, 6)
         begin
-          q  = ch.queue(queue, :exclusive => true)
+          q  = ch.queue(queue, exclusive: true)
 
           q.bind("amq.fanout").subscribe do |_, _, payload|
             t += payload.bytesize
@@ -45,7 +47,7 @@ unless ENV["CI"]
           end
         rescue Interrupt => e
           ch.maybe_kill_consumer_work_pool!
-          ch.close
+          ch.close rescue nil
         end
       end
       ct.abort_on_exception = true
@@ -68,7 +70,7 @@ unless ENV["CI"]
             sleep (s * rand)
           end
         rescue Interrupt => e
-          ch.close
+          ch.close rescue nil
         end
       end
       pt.abort_on_exception = true

data/spec/unit/concurrent/condition_spec.rb

@@ -4,7 +4,7 @@ require "bunny/concurrent/condition"
 describe Bunny::Concurrent::Condition do
 
   describe "#wait" do
-    100.times do |i|
+    50.times do |i|
       it "blocks current thread until notified (take #{i})" do
         condition = described_class.new
         xs        = []
@@ -12,7 +12,7 @@ describe Bunny::Concurrent::Condition do
         t = Thread.new do
           xs << :notified
 
-          sleep 0.25
+          sleep 0.2
           condition.notify
         end
         t.abort_on_exception = true
@@ -24,7 +24,7 @@ describe Bunny::Concurrent::Condition do
   end
 
   describe "#notify" do
-    100.times do |i|
+    50.times do |i|
       it "notifies a single thread waiting on the latch (take #{i})" do
         mutex     = Mutex.new
         condition = described_class.new
@@ -42,7 +42,7 @@ describe Bunny::Concurrent::Condition do
         end
         t2.abort_on_exception = true
 
-        sleep 0.25
+        sleep 0.2
         condition.notify
         sleep 0.5
         expect(xs).to satisfy { |ys| ys.size == 1 && (ys.include?(:notified1) || ys.include?(:notified2)) }
@@ -53,7 +53,7 @@ describe Bunny::Concurrent::Condition do
   describe "#notify_all" do
     let(:n) { 30 }
 
-    100.times do |i|
+    50.times do |i|
       it "notifies all the threads waiting on the latch (take #{i})" do
         mutex     = Mutex.new
         condition = described_class.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -145,7 +145,6 @@ files:
 - spec/higher_level_api/integration/basic_nack_spec.rb
 - spec/higher_level_api/integration/basic_publish_spec.rb
 - spec/higher_level_api/integration/basic_qos_spec.rb
-- spec/higher_level_api/integration/basic_recover_spec.rb
 - spec/higher_level_api/integration/basic_reject_spec.rb
 - spec/higher_level_api/integration/basic_return_spec.rb
 - spec/higher_level_api/integration/channel_close_spec.rb
@@ -153,7 +152,6 @@ files:
 - spec/higher_level_api/integration/connection_recovery_spec.rb
 - spec/higher_level_api/integration/connection_spec.rb
 - spec/higher_level_api/integration/connection_stop_spec.rb
-- spec/higher_level_api/integration/consistent_hash_exchange_spec.rb
 - spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb
 - spec/higher_level_api/integration/dead_lettering_spec.rb
 - spec/higher_level_api/integration/exchange_bind_spec.rb
@@ -182,6 +180,7 @@ files:
 - spec/issues/issue141_spec.rb
 - spec/issues/issue202_spec.rb
 - spec/issues/issue224_spec.rb
+- spec/issues/issue465_spec.rb
 - spec/issues/issue78_spec.rb
 - spec/issues/issue83_spec.rb
 - spec/issues/issue97_attachment.json
@@ -244,7 +243,6 @@ test_files:
 - spec/higher_level_api/integration/basic_nack_spec.rb
 - spec/higher_level_api/integration/basic_publish_spec.rb
 - spec/higher_level_api/integration/basic_qos_spec.rb
-- spec/higher_level_api/integration/basic_recover_spec.rb
 - spec/higher_level_api/integration/basic_reject_spec.rb
 - spec/higher_level_api/integration/basic_return_spec.rb
 - spec/higher_level_api/integration/channel_close_spec.rb
@@ -252,7 +250,6 @@ test_files:
 - spec/higher_level_api/integration/connection_recovery_spec.rb
 - spec/higher_level_api/integration/connection_spec.rb
 - spec/higher_level_api/integration/connection_stop_spec.rb
-- spec/higher_level_api/integration/consistent_hash_exchange_spec.rb
 - spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb
 - spec/higher_level_api/integration/dead_lettering_spec.rb
 - spec/higher_level_api/integration/exchange_bind_spec.rb
@@ -281,6 +278,7 @@ test_files:
 - spec/issues/issue141_spec.rb
 - spec/issues/issue202_spec.rb
 - spec/issues/issue224_spec.rb
+- spec/issues/issue465_spec.rb
 - spec/issues/issue78_spec.rb
 - spec/issues/issue83_spec.rb
 - spec/issues/issue97_attachment.json

data/spec/higher_level_api/integration/basic_recover_spec.rb

@@ -1,18 +0,0 @@
-require "spec_helper"
-
-describe Bunny::Channel, "#recover" do
-  let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
-    c.start
-    c
-  end
-
-  subject do
-    connection.create_channel
-  end
-
-  it "is supported" do
-    expect(subject.recover(true)).to be_instance_of(AMQ::Protocol::Basic::RecoverOk)
-    expect(subject.recover(true)).to be_instance_of(AMQ::Protocol::Basic::RecoverOk)
-  end
-end

data/spec/higher_level_api/integration/consistent_hash_exchange_spec.rb

@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-require "spec_helper"
-
-describe "x-consistent-hash exchange" do
-  let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed",
-      :automatically_recover => true)
-    c.start
-    c
-  end
-
-  let(:http_client) { RabbitMQ::HTTP::Client.new("http://127.0.0.1:15672") }
-
-  after :each do
-    connection.close
-  end
-
-  let(:list) { Range.new(0, 6).to_a.map(&:to_s) }
-
-  let(:m) { 1500 }
-
-  let(:exchange_plugin_available) do
-    http_client.overview.exchange_types.map(&:name).include?("x-consistent-hash")
-  end
-
-  it "distributes messages between queues bound with the same routing key" do
-    if exchange_plugin_available
-      ch   = connection.create_channel
-      body = "сообщение"
-      # requires the consistent hash exchange plugin,
-      # enable it with
-      #
-      # $ [sudo] rabbitmq-plugins enable rabbitmq_consistent_hash_exchange
-      x    = ch.exchange("bunny.stress.concurrent.consumers", :type => "x-consistent-hash", :durable => true)
-
-      qs = []
-
-      q1 = ch.queue("", :exclusive => true).bind(x, :routing_key => "5")
-      q2 = ch.queue("", :exclusive => true).bind(x, :routing_key => "5")
-
-      sleep 1.0
-
-      5.times do |i|
-        m.times do
-          x.publish(body, :routing_key => list.sample)
-        end
-        puts "Published #{(i + 1) * m} tiny messages..."
-      end
-
-      sleep 2.0
-      expect(q1.message_count).to be > 100
-      expect(q2.message_count).to be > 100
-
-      ch.close
-    else
-      skip "x-consistent-hash exchange type isn't available"
-    end # if
-  end # it
-end