amqp 0.9.10 → 1.0.0.pre1

data/spec/integration/extensions/rabbitmq/publisher_confirmations_spec.rb

@@ -67,6 +67,22 @@ describe "Publisher confirmation(s)" do
     @channel2 = AMQP::Channel.new
   end
 
+  it 'should increment publisher_index confirming channel' do
+    channel3 = AMQP::Channel.new
+    exchange = channel3.fanout("amqpgem.tests.fanout0", :auto_delete => true)
+
+    channel3.confirm_select
+    channel3.publisher_index.should == 0
+
+    EventMachine.add_timer(0.5) do
+      exchange.publish("Hi")
+    end
+
+    done(2.0) do
+      channel3.publisher_index.should == 1
+    end
+  end
+
 
   context "when messages are transient" do
     context "and routable" do
@@ -116,7 +132,7 @@ describe "Publisher confirmation(s)" do
         end
 
         EventMachine.add_timer(0.5) do
-          exchange.publish("Hi", :persistent => false)
+          exchange.publish("Hi", :persistent => false, :immediately => true)
         end
 
         done(2.0) do

data/spec/integration/fanout_exchange_routing_spec.rb

@@ -77,7 +77,7 @@ describe AMQP::Exchange, "of type fanout" do
       end
 
       # for Rubinius, it is surprisingly slow on this workload
-      done(1.5) {
+      done(2.5) {
         [@queue1, @queue2, @queue3].each do |q|
           @received_messages[q.name].size.should == @expected_number_of_messages[q.name]
 

data/spec/integration/immediate_messages_spec.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+require 'spec_helper'
+
+
+describe "When queue has no consumers" do
+
+  #
+  # Environment
+  #
+
+  include EventedSpec::AMQPSpec
+  default_timeout 1.5
+
+  amqp_before do
+    @producer_channel    = AMQP::Channel.new
+    @consumer_channel    = AMQP::Channel.new
+  end
+
+  # ...
+
+
+  #
+  # Examples
+  #
+
+  context "and message is published as :immediate" do
+    it "that message is returned to the publisher" do
+      exchange = @producer_channel.fanout("amq.fanout")
+      queue    = @consumer_channel.queue("", :exclusive => true)
+
+      exchange.on_return do |basic_return, metadata, payload|
+        done if payload == "immediate message body"
+      end
+
+      queue.bind(exchange) do
+        exchange.publish "immediate message body", :immediate => true
+      end
+    end
+  end
+
+
+
+  context "and message is published as non :immediate" do
+    it "that message is dropped" do
+      exchange = @producer_channel.fanout("amq.fanout")
+      queue    = @consumer_channel.queue("", :exclusive => true)
+
+      exchange.on_return do |basic_return, metadata, payload|
+        fail "Should not happen"
+      end
+
+      queue.bind(exchange) do
+        exchange.publish "non-immediate message body", :immediate => false
+      end
+
+      done(1.0)
+    end
+  end
+end # describe

data/spec/integration/multiple_consumers_per_queue_spec.rb

@@ -58,7 +58,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -104,7 +104,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -150,7 +150,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -199,7 +199,7 @@ describe "Multiple non-exclusive consumers per queue" do
 
       EventMachine.add_timer(1.0) do
         messages.each do |message|
-          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
+          exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
         end
       end
 
@@ -213,47 +213,109 @@ describe "Multiple non-exclusive consumers per queue" do
 
 
 
-  context "with equal prefetch levels, a server-named queue and two consumers cancelled mid-flight" do
-    it "have messages distributed to the only active consumer" do
-      channel = AMQP::Channel.new
-      channel.on_error do |ch, channel_close|
-        raise(channel_close.reply_text)
-      end
+  unless ENV["CI"]
+    context "with equal prefetch levels, a server-named queue and two consumers cancelled mid-flight" do
+      it "have messages distributed to the only active consumer" do
+        channel = AMQP::Channel.new
+        channel.on_error do |ch, channel_close|
+          raise(channel_close.reply_text)
+        end
 
-      queue   = channel.queue("", :auto_delete => true)
-      consumer1 = AMQP::Consumer.new(channel, queue)
-      consumer2 = AMQP::Consumer.new(channel, queue)
+        queue   = channel.queue("", :auto_delete => true)
+        consumer1 = AMQP::Consumer.new(channel, queue)
+        consumer2 = AMQP::Consumer.new(channel, queue)
 
-      consumer1.consume.on_delivery do |basic_deliver, metadata, payload|
-        @consumer1_mailbox << payload
-      end
+        consumer1.consume.on_delivery do |basic_deliver, metadata, payload|
+          @consumer1_mailbox << payload
+        end
 
-      consumer2.consume(true).on_delivery do |metadata, payload|
-        @consumer2_mailbox << payload
-      end
-      queue.subscribe do |metadata, payload|
-        @consumer3_mailbox << payload
-      end
-      queue.unsubscribe
-      consumer2.cancel
+        consumer2.consume(true).on_delivery do |metadata, payload|
+          @consumer2_mailbox << payload
+        end
+        queue.subscribe do |metadata, payload|
+          @consumer3_mailbox << payload
+        end
+        queue.unsubscribe
+        consumer2.cancel
 
 
-      exchange = channel.default_exchange
-      exchange.on_return do |basic_return, metadata, payload|
-        raise(basic_return.reply_text)
-      end
+        exchange = channel.default_exchange
+        exchange.on_return do |basic_return, metadata, payload|
+          raise(basic_return.reply_text)
+        end
 
-      EventMachine.add_timer(1.0) do
-        messages.each do |message|
-          exchange.publish(message, :mandatory => true, :routing_key => queue.name)
+        EventMachine.add_timer(1.0) do
+          messages.each do |message|
+            exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
+          end
         end
-      end
 
-      done(5.0) {
-        @consumer1_mailbox.size.should == 100
-        @consumer2_mailbox.size.should == 0
-        @consumer3_mailbox.size.should == 0
-      }
-    end # it
-  end # context
+        done(5.0) {
+          @consumer1_mailbox.size.should == 100
+          @consumer2_mailbox.size.should == 0
+          @consumer3_mailbox.size.should == 0
+        }
+      end # it
+    end # context
+
+
+
+    context "with equal prefetch levels and ALL consumers cancelled mid-flight" do
+      it "returns all immediate messages" do
+        @returned_messages = []
+
+        channel = AMQP::Channel.new
+        channel.on_error do |ch, channel_close|
+          raise(channel_close.reply_text)
+        end
+
+        queue   = channel.queue("amqpgem.integration.roundrobin.queue1", :auto_delete => true) do
+          consumer1 = AMQP::Consumer.new(channel, queue)
+          consumer2 = AMQP::Consumer.new(channel, queue, "#{queue.name}-consumer-#{rand}-#{Time.now}", false, true)
+
+          consumer1.consume.on_delivery do |basic_deliver, metadata, payload|
+            @consumer1_mailbox << payload
+          end
+
+          consumer2.consume(true).on_delivery do |metadata, payload|
+            @consumer2_mailbox << payload
+          end
+
+          queue.subscribe do |metadata, payload|
+            @consumer3_mailbox << payload
+          end
+          queue.should be_subscribed
+          queue.unsubscribe
+          queue.should_not be_subscribed
+
+          consumer2.should be_subscribed
+          consumer2.callback.should_not be_nil
+          consumer2.cancel
+          consumer2.should_not be_subscribed
+          consumer2.callback.should be_nil
+
+          consumer1.should be_subscribed
+          consumer1.callback.should_not be_nil
+          consumer1.cancel
+          consumer1.should_not be_subscribed
+          consumer1.callback.should be_nil
+        end
+
+        exchange = channel.default_exchange
+        exchange.on_return do |basic_return, metadata, payload|
+          @returned_messages << payload
+        end
+
+        EventMachine.add_timer(1.0) do
+          messages.each do |message|
+            exchange.publish(message, :immediate => true, :mandatory => true, :routing_key => queue.name)
+          end
+        end
+
+        done(6.0) {
+          @returned_messages.size.should == 100
+        }
+      end # it
+    end # context    
+  end
 end # describe

data/spec/integration/queue_redeclaration_with_incompatible_attributes_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe "AMQP queue redeclaration with different attributes" do
+describe AMQP do
 
   #
   # Environment
@@ -17,7 +17,7 @@ describe "AMQP queue redeclaration with different attributes" do
   # Examples
   #
 
-  context "when :durable value is different" do
+  context "when queue is redeclared with different attributes" do
     let(:name)              { "amqp-gem.nondurable.queue" }
     let(:options)           {
       { :durable => false, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false }
@@ -25,48 +25,35 @@ describe "AMQP queue redeclaration with different attributes" do
     let(:different_options) {
       { :durable => true, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false}
     }
+    let(:irrelevant_different_options) {
+      { :durable => false, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false, :header => {:random => 'stuff' } }
+    }
 
 
     it "should raise AMQP::IncompatibleOptionsError for incompatable options" do
       channel = AMQP::Channel.new
-      channel.on_error do |ch, channel_close|
-        @error_code = channel_close.reply_code
+      channel.on_error do |ch, close|
+        @callback_fired = true
       end
 
       channel.queue(name, options)
       expect {
         channel.queue(name, different_options)
       }.to raise_error(AMQP::IncompatibleOptionsError)
-
-      done(0.5) {
-        @error_code.should == 406
-      }
+      done
     end
-  end
-
-  context "when :headers are different" do
-    let(:name)              { "amqp-gem.nondurable.queue" }
-    let(:options)           {
-      { :durable => false, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false }
-    }
-    let(:different_options) {
-      { :durable => false, :exclusive => true, :auto_delete => true, :arguments => {}, :passive => false, :header => {:random => 'stuff' } }
-    }
 
     it "should not raise AMQP::IncompatibleOptionsError for irrelevant options" do
       channel = AMQP::Channel.new
-      channel.on_error do |ch, channel_close|
-        @error_code = channel_close.reply_code
+      channel.on_error do |ch, close|
+        @callback_fired = true
       end
 
       channel.queue(name, options)
       expect {
-        channel.queue(name, different_options)
+        channel.queue(name, irrelevant_different_options)
       }.to_not raise_error(AMQP::IncompatibleOptionsError)
-
-      done(0.5) {
-        @error_code.should == 406
-      }
+      done
     end
   end
 end # describe AMQP

data/spec/integration/regressions/concurrent_publishing_on_the_same_channel_spec.rb

@@ -73,7 +73,7 @@ if mri?
         20.times do
           Thread.new do
             messages.each do |message|
-              exchange.publish(message, :routing_key => queue.name, :mandatory => true)
+              exchange.publish(message, :routing_key => queue.name, :immediate => true, :mandatory => true)
             end
           end
         end

data/spec/integration/reply_queue_communication_spec.rb

@@ -53,7 +53,8 @@ describe "Exclusive server-named queue" do
                           :reply_to    => queue2.name,
                           :app_id      => "Client",
                           :timestamp   => request_timestamp,
-                          :mandatory   => true)
+                          :mandatory   => true,
+                          :immediate   => true)
 
         done(0.2) {
           queue1.unsubscribe

data/spec/integration/store_and_forward_spec.rb

@@ -53,16 +53,19 @@ describe "Store-and-forward routing" do
         @queue.subscribe(:ack => false) do |payload|
           payload.should_not be_nil
           number_of_received_messages += 1
-          payload.should == dispatched_data
+          if RUBY_VERSION =~ /^1.9/
+            payload.force_encoding("UTF-8").should == dispatched_data
+          else
+            payload.should == dispatched_data
+          end
         end # subscribe
 
-        delayed(0.3) do
-          expected_number_of_messages.times do
-            @exchange.publish(dispatched_data, :routing_key => @queue_name)
-          end
+        expected_number_of_messages.times do
+          @exchange.publish(dispatched_data, :routing_key => @queue_name)
         end
 
-        done(4.0) {
+        # 6 seconds are for Rubinius, it is surprisingly slow on this workload
+        done(6.0) {
           number_of_received_messages.should == expected_number_of_messages
           @queue.unsubscribe
         }

data/spec/integration/topic_subscription_spec.rb

@@ -66,9 +66,9 @@ describe "Topic-based subscription" do
       # publish some messages none of our queues should be receiving
       3.times do
         @exchange.publish(626 + rand(1000)/400.0, :key => "nasdaq.goog")
-      end
+      end # do
 
-      done(0.5) {
+      done(0.4) {
         received_messages.should == expected_messages
         @aapl_queue.unsubscribe
         @amzn_queue.unsubscribe
@@ -117,7 +117,7 @@ describe "Topic-based subscription" do
       @exchange.publish("Blatche, Wall lead Wizards over Jazz 108-101", :key => "sports.nba.jazz")
       @exchange.publish("Deron Williams Receives NBA Cares Community Assist Award", :key => "sports.nba.jazz")
 
-      done(0.6) {
+      done(0.2) {
         received_messages.should == expected_messages
 
         @nba_queue.unsubscribe
@@ -151,7 +151,6 @@ describe "Topic-based subscription" do
         @celtics_queue.name => 3
       }
 
-
       @sports_queue.bind(@exchange, :key => "sports.#").subscribe do |payload|
         received_messages[@sports_queue.name] += 1
       end
@@ -181,7 +180,7 @@ describe "Topic-based subscription" do
       @exchange.publish("Philadelphia's Daniel Briere has been named as an All-Star replacement for Jarome Iginla.", :key => "sports.nhl.allstargame")
       @exchange.publish("Devils blank Sid- and Malkin-less Penguins 2-0", :key => "sports.nhl.penguins")
 
-      done(0.5) {
+      done(0.2) {
         received_messages.should == expected_messages
 
         @sports_queue.unsubscribe

data/spec/spec_helper.rb

@@ -15,12 +15,6 @@ puts "Using Ruby #{RUBY_VERSION}, amq-client #{AMQ::Client::VERSION} and amq-pro
 
 amqp_config = File.dirname(__FILE__) + '/amqp.yml'
 
-port = if ENV["TRACER"]
-         5673
-       else
-         5672
-       end
-
 if File.exists? amqp_config
   class Hash
     def symbolize_keys
@@ -34,7 +28,7 @@ if File.exists? amqp_config
   end
   AMQP_OPTS = YAML::load_file(amqp_config).symbolize_keys[:test]
 else
-  AMQP_OPTS = {:host => 'localhost', :port => port}
+  AMQP_OPTS = {:host => 'localhost', :port => 5672}
 end
 
 # puts "AMQP_OPTS = #{AMQP_OPTS.inspect}"
@@ -88,4 +82,4 @@ module PlatformDetection
   def rubinius?
     defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'rbx')
   end
-end
+end