Add TTL to AMQP messages

This patch sets a TTL derived from the timeout parameter used
when invoking the RPC.

Needed for:
 * Bug 1053614

Change-Id: Idaf9a2a972feac3f95f170c52632033b027b4414

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/unit/rpc/test_kombu.py b/tests/unit/rpc/test_kombu.py
index b28c568..a201940 100644
--- a/tests/unit/rpc/test_kombu.py
+++ b/tests/unit/rpc/test_kombu.py
@@ -24,6 +24,7 @@ eventlet.monkey_patch()
 
 import contextlib
 import logging
+import time
 
 from openstack.common import cfg
 from openstack.common import exception
@@ -109,6 +110,24 @@ class RpcKombuTestCase(common.BaseRpcAMQPTestCase):
 
         self.assertEqual(self.received_message, message)
 
+    def test_message_ttl_on_timeout(self):
+        """Test message ttl being set by request timeout. The message
+        should die on the vine and never arrive."""
+        conn = self.rpc.create_connection(FLAGS)
+        message = 'topic test message'
+
+        self.received_message = None
+
+        def _callback(message):
+            self.received_message = message
+            self.fail("should not have received this message")
+
+        conn.declare_topic_consumer('a_topic', _callback)
+        conn.topic_send('a_topic', rpc_common.serialize_msg(message), 0)
+        conn.iterconsume(1, 2)
+
+        conn.close()
+
     def test_topic_send_receive_exchange_name(self):
         """Test sending to a topic exchange/queue with an exchange name"""