iron_mq 4.0.3 → 4.0.5

data/test/test_beanstalkd.rb

@@ -148,7 +148,7 @@ class BeanstalkTests < TestBase
     assert job.nil?, "job is not nil"
 
     # wait for delay to expire
-    sleep 2
+    sleep 3
     job = reserve(0)
     assert_not_nil job, "job is nil"
     assert_equal msg, job.body, "body not the same as message."

data/test/test_iron_mq.rb

@@ -27,9 +27,20 @@ class IronMQTests < TestBase
     end
   end
 
+  def test_get
+    queue_name = "some_queue_abcj9u23"
+    queue = @client.queue(queue_name)
+    msg = queue.get
+    v = "hello big world"
+    queue.post(v)
+    msg = queue.get
+    msg.delete
+    msg = queue.get
+
+  end
 
   def test_basics
-    queue_name = 'test_basics_7'
+    queue_name = 'test_basics_71'
     clear_queue(queue_name)
 
     # NOTE: Kept for backward compatibility checking
@@ -41,7 +52,7 @@ class IronMQTests < TestBase
     assert res["id"]
     assert res.id
     assert res.msg
-
+    sleep 0.3
     assert_equal 1, queue.size
 
     message = queue.get
@@ -56,7 +67,8 @@ class IronMQTests < TestBase
     # p res
     assert_nil res
 
-    assert_equal 0, queue.size
+    sleep 0.3
+    assert_equal 0, queue.reload.size
 
     res = queue.post("hello world 2!")
     # p res
@@ -114,9 +126,28 @@ class IronMQTests < TestBase
     assert_equal 200, resp.code, "API must response with HTTP 200 status, but returned HTTP #{resp.code}"
   end
 
+  def test_multi_delete
+    queue_name = 'test_multi_delete_41'
+    clear_queue(queue_name)
+
+    queue = @client.queue(queue_name)
+    ids = []
+    10.times do |i|
+      msg = queue.post("hello #{i}")
+      ids << msg.id
+    end
+    sleep 0.5
+    assert_equal 10, queue.reload.size
+
+    queue.delete_messages(ids)
+    sleep 1
+    assert_equal 0, queue.reload.size
+    queue.delete_queue
+
+  end
 
   def test_queues_list
-    queue_name = 'test_queues_list'
+    queue_name = 'test_queues_list_1'
     clear_queue(queue_name)
 
     queue = @client.queue(queue_name)
@@ -141,7 +172,7 @@ class IronMQTests < TestBase
 
   # TODO: pass :timeout in post/get messages and test those
   def test_timeout
-    queue_name = "test_timeout_6"
+    queue_name = "test_timeout_71"
     clear_queue(queue_name)
 
     queue = @client.queue(queue_name)
@@ -157,21 +188,11 @@ class IronMQTests < TestBase
     # p msg_nil
     assert_nil msg_nil
 
-    tries = MAX_TRIES
-    while tries > 0
-      sleep 2
-      tries -= 1
-
-      new_msg = queue.get
-      # p new_msg
-      next if new_msg.nil?
-
-      assert_equal new_msg.id, msg.id
-
-      new_msg.delete
-      break
-    end
-    assert_not_equal tries, 0
+    sleep 61 # should be 1 minute timeout by default
+    new_msg = queue.get
+    assert_not_nil new_msg
+    assert_equal new_msg.id, msg.id
+    new_msg.delete
 
     # now try explicit timeout
     res = queue.post("hello world timeout2!", :timeout => 30)
@@ -185,25 +206,16 @@ class IronMQTests < TestBase
     # p msg_nil
     assert_nil msg_nil
 
-    tries = MAX_TRIES
-    while tries > 0
-      sleep 2
-      tries -= 1
-
-      new_msg = queue.get
-      next if new_msg.nil?
-
-      assert_equal new_msg.id, msg.id
-
-      new_msg.delete
-      break
-    end
-    assert_not_equal tries, 0
+    sleep 31
+    new_msg = queue.get
+    assert_not_nil new_msg
+    assert_equal new_msg.id, msg.id
+    new_msg.delete
 
     # timeout on get
     res = queue.post("hello world timeout3!")
     msg = queue.get(:timeout => 30)
-    puts "MESSAGE IS #{msg.inspect}"
+#    puts "MESSAGE IS #{msg.inspect}"
     assert msg
     assert_equal msg.timeout, 30
 
@@ -211,20 +223,11 @@ class IronMQTests < TestBase
     # p msg_nil
     assert_nil msg_nil
 
-    tries = MAX_TRIES
-    while tries > 0
-      sleep 2
-      tries -= 1
-
-      new_msg = queue.get
-      next if new_msg.nil?
-
-      assert_equal msg.id, new_msg.id
-
-      new_msg.delete
-      break
-    end
-    assert_not_equal tries, 0
+    sleep 31
+    new_msg = queue.get
+    assert_not_nil new_msg
+    assert_equal new_msg.id, msg.id
+    new_msg.delete
 
     # delete queue on test complete
     resp = queue.delete_queue
@@ -234,20 +237,21 @@ class IronMQTests < TestBase
   def test_queues
     puts 'test_queues'
 
-    # Now client library is not provide plain call to API
-    # But creates Queue object instead
-    # also added `#new?` method to check is queue exist
-    #
-    #assert_raise Rest::HttpError do
-    #  # should raise a 404
-    #  q = @client.queues.get(:name => "some_queue_that_does_not_exist")
-    #end
-    queue = @client.queues.get(:name => "some_queue_that_does_not_exist")
-    assert queue.new?
+    qname = "some_queue_that_does_not_exist_1"
+    queue = @client.queue(qname)
+    # delete it before the test
+    queue.delete_queue
+
+    assert_raise Rest::HttpError do
+      # should raise a 404
+      m = queue.size
+    end
 
     # create at least one queue
     queue.post('create queue message')
-    assert_equal queue.new?, false, "queue must exist on the service after post message to"
+    # queue should exist now
+    m = queue.get
+    assert_not_nil m
 
     res = @client.queues.list
     # puts "res.size: #{res.size}"
@@ -258,7 +262,7 @@ class IronMQTests < TestBase
     end
     assert res.size > 0
 
-    res = @client.queues.list(:page => 15)
+    res = @client.queues.list(:page => 50)
     # puts "res.size 2: #{res.size}"
     # res.each do |q| { p q.name }
 
@@ -272,32 +276,22 @@ class IronMQTests < TestBase
   def test_delay
     puts 'test_delay'
 
-    queue_name = "test_delay_6"
+    queue_name = "test_delay_61"
     clear_queue(queue_name)
 
     msgTxt = "testMessage-"+Time.now.to_s
     # puts msgTxt
     queue = @client.queue(queue_name)
-    queue.post(msgTxt, {:delay => 5})
+    msg_id = queue.post(msgTxt, {:delay => 5}).id
     msg = queue.get
     # p msg
     assert_nil msg
 
-    tries = MAX_TRIES
-    while tries > 0
-      sleep 0.5
-      tries -= 1
-      sleep 1
-
-      msg = queue.get
-      # p msg
-      next if msg.nil?
-
-      assert_equal msg.body, msgTxt
-
-      break
-    end
-    assert_not_equal tries, 0
+    sleep 6
+    new_msg = queue.get
+    assert_not_nil new_msg
+    assert_equal msg_id, new_msg.id
+    new_msg.delete
 
     # delete queue on test complete
     resp = queue.delete_queue
@@ -307,7 +301,7 @@ class IronMQTests < TestBase
   def test_batch
     puts 'test_batch'
 
-    queue_name = "test_batch_6"
+    queue_name = "test_batch_61"
     clear_queue(queue_name)
 
     x = []
@@ -325,10 +319,16 @@ class IronMQTests < TestBase
     msg = queue.get
     assert msg
     assert msg['id']
+    puts "Deleting message #{msg.id}"
     msg.delete
+    sleep 2
 
     msgs = queue.get(:n => 10)
     assert msgs.is_a?(Array)
+    msgs.each do |m|
+      puts m.id
+      assert_not_equal msg.id, m.id
+    end
     assert msgs.size == 9, "size should be 9, but it's #{msgs.size}"
     assert msgs[0]["id"]
 
@@ -345,13 +345,22 @@ class IronMQTests < TestBase
   def test_peek
     puts "test_message_peek"
 
-    queue_name = "test_msg_peek"
+    queue_name = "test_msg_peek_1"
     clear_queue(queue_name)
 
     queue = @client.queue(queue_name)
-    queue.post([ {:body => "first message"},
-                 {:body => "second message"},
-                 {:body => "third message"} ])
+    queue.post("zero message")
+    msg = queue.get
+    msg.delete
+
+    msg = queue.peek
+    assert_nil msg
+
+    queue.post("first message")
+    sleep 1
+    queue.post("second message")
+    sleep 1
+    queue.post("third message")
 
     msg = queue.peek
     assert_not_nil msg
@@ -390,30 +399,30 @@ class IronMQTests < TestBase
   end
 
   def test_touch
-    puts "test_message_touch"
+    puts "in test_touch"
 
-    queue_name = "test_msg_touch"
+    queue_name = "test_msg_touch_3"
     clear_queue(queue_name)
 
     queue = @client.queue(queue_name)
-    queue.post([
-                {:body => "first message"},
-                {:body => "second message"},
-                {:body => "third message"}
-               ],
-               {:timeout => 30}) # minimum timeout
+    queue.post("first message", :timeout => 30)
+    queue.post("second message", :timeout => 30)
+    queue.post("third message", :timeout => 30)
+
 
     # get message
     msg = queue.get
     assert_not_nil msg
-    assert_equal "first message", msg.body, "message body must be 'first message', but it's '#{msg.body}'"    
+    assert_equal "first message", msg.body, "message body must be 'first message', but it's '#{msg.body}'"
 
     sleep 15 # timeout is not passed
 
     msgs = queue.peek(:n => 3) # all messages from queue
     assert_equal Array, msgs.class, "waiting for Array, but got #{msgs.class}"
     assert_equal 2, msgs.size, "API must return only 2 messages"
-    msgs.each { |m| assert_not_equal msg.id, m.id, "returned message which must be reserved" }
+    msgs.each do |m|
+      assert_not_equal msg.id, m.id, "returned a message which must be reserved"
+    end
 
     sleep 20 # ensure timeout is passed
 
@@ -421,7 +430,6 @@ class IronMQTests < TestBase
     msgs = queue.peek(:n => 3)
     assert_equal Array, msgs.class, "waiting for Array, but got #{msgs.class}"
     assert_equal 3, msgs.size, "API must return 3 messages"
-    assert_equal msg.id, msgs[2].id, "released message must be at the end of the queue"
 
     msg = queue.get
     assert_not_nil msg
@@ -463,12 +471,12 @@ class IronMQTests < TestBase
     queue_name = "test_release_6"
     clear_queue(queue_name)
 
-    msgTxt = "testMessage-"+Time.now.to_s
+    msg_txt = "testMessage-"+Time.now.to_s
     # puts msgTxt
 
     queue = @client.queue(queue_name)
 
-    msg_id = queue.post(msgTxt, {:timeout => 60*5}).id
+    msg_id = queue.post(msg_txt, {:timeout => 60*5}).id
     # puts "msg_id: #{msg_id}"
     message = queue.get
     # p msg
@@ -498,42 +506,20 @@ class IronMQTests < TestBase
     # p msg
     assert_nil msgr
 
-    tries = MAX_TRIES
-    while tries > 0
-      sleep 0.5
-      tries -= 1
-      sleep 1
-
-      msg = queue.get
-      next if msg.nil?
-
-      #p msg
-      assert_equal msg.id, msg_id
-
-      break
-    end
-    assert_not_equal tries, 0
+    sleep 11
+    msg = queue.get
+    assert_not_nil msg
+    assert_equal msg_id, msg.id
 
     msg.release(:delay => 5)
     msg = queue.get
     # p msg
     assert_nil msg
 
-    tries = MAX_TRIES
-    while tries > 0
-      sleep 0.5
-      tries -= 1
-      sleep 1
-
-      msg = queue.get
-      next if msg.nil?
-
-      # p msg
-      assert_equal msg.id, msg_id
-
-      break
-    end
-    assert_not_equal tries, 0
+    sleep 6
+    msg = queue.get
+    assert_not_nil msg
+    assert_equal msg_id, msg.id
 
     # delete queue on test complete
     resp = queue.delete_queue
@@ -544,21 +530,23 @@ class IronMQTests < TestBase
   def test_clear
     puts "test_clear"
 
-    queue = @client.queue("test_clear_7")
+    queue = @client.queue("test_clear_9")
     clear_queue(queue.name)
 
     val = "hi mr clean"
     queue.post(val)
 
-    sleep 2 # make sure the counter has time to update
-    assert_equal 1, queue.size
+    sleep 0.5 # make sure the counter has time to update
+    assert_equal 1, queue.reload.size
 
     queue.clear
 
     msg = queue.get
     assert_nil msg
 
-    assert_equal 0, queue.size
+    sleep 0.5
+
+    assert_equal 0, queue.reload.size
 
     # delete queue on test complete
     resp = queue.delete_queue
@@ -583,14 +571,6 @@ class IronMQTests < TestBase
 
     assert_equal 5, i
 
-    tries = MAX_TRIES
-    while tries > 0
-      tries -= 1
-      break if 0 == queue.size
-      sleep 1
-    end
-    assert_not_equal tries, 0
-
     # delete queue on test complete
     resp = queue.delete_queue
     assert_equal 200, resp.code, "API must response with HTTP 200 status, but returned HTTP #{resp.code}"
@@ -607,9 +587,8 @@ class IronMQTests < TestBase
 
     queue.post("hi2")
     # p queue
-    q_info = queue.info
-    assert_not_equal old_id, q_info.id, "old queue ID (#{old_id}) must not be equal to new ID (#{q_info.id})"
-    assert_equal 1, q_info.size, "queue size must be 1, but got #{q_info.size}"
+    assert_not_equal old_id, queue.id, "old queue ID (#{old_id}) must not be equal to new ID (#{queue.id})"
+    assert_equal 1, queue.size, "queue size must be 1, but got #{queue.size}"
 
     msg = queue.get
     assert_equal "hi2", msg.body, "message body must be 'hi2', but got '#{msg.body}'"
@@ -640,5 +619,60 @@ class IronMQTests < TestBase
     assert_equal 200, resp.code, "API must response with HTTP 200 status, but returned HTTP #{resp.code}"
   end
 
+
+  def test_queue_params
+
+    qname = "test_queue_params_1"
+
+    clear_queue(qname)
+    q = @client.queue(qname)
+
+    q.post("message 1", :timeout => 200, :delay => 0, :expires_in => 2000)
+    q.post("message 1", :timeout => 300, :delay => 0, :expires_in => 3000)
+
+    msgs = q.get(:n => 2)
+
+    msgs.each do |m|
+      puts m.body
+      puts "timeout: #{m.timeout}"
+      puts "expires_in: #{m.expires_in}"
+      puts "delay: #{m.delay}"
+    end
+
+  end
+
+
+  def test_reserved_count
+    puts "test_reserved_count"
+
+    queue_name = "test_reserved_count"
+    clear_queue(queue_name)
+
+    queue = @client.queue(queue_name)
+    queue.post("zero message")
+    msg = queue.get
+    p msg
+    puts "id: #{msg.id} reserved_count: #{msg.reserved_count}"
+    msg.release
+    msg = queue.get
+    p msg
+    puts "id: #{msg.id} reserved_count: #{msg.reserved_count}"
+    msg.release
+    msg = queue.get
+    p msg
+    puts "id: #{msg.id} reserved_count: #{msg.reserved_count}"
+
+
+  end
+
+  def test_queue_set_info
+    qname = "test_queue_set_info"
+    clear_queue(qname)
+    q = @client.queue(qname)
+    q.update_queue(:push_type => 'unicast')
+    assert_equal 'unicast', q.push_type
+    q.update_queue(:retries => 10)
+    assert_equal 'unicast', q.reload.push_type
+  end
 end