Author: kpvdr
Date: Tue Jan 19 21:07:06 2010
New Revision: 900956

URL: http://svn.apache.org/viewvc?rev=900956&view=rev
Log:
Added support for extended properties in the broker test framework

Modified:
    qpid/trunk/qpid/python/qpid/brokertest.py

Modified: qpid/trunk/qpid/python/qpid/brokertest.py
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/brokertest.py?rev=900956&r1=900955&r2=900956&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/brokertest.py (original)
+++ qpid/trunk/qpid/python/qpid/brokertest.py Tue Jan 19 21:07:06 2010
@@ -219,17 +219,30 @@
         s = c.session(str(qpid.datatypes.uuid4()))
         s.queue_declare(queue=queue)
         c.close()
-
-    def send_message(self, queue, message):
-        s = self.connect().session()
-        s.sender(queue+"; {create:always}").send(message)
-        s.connection.close()
-
-    def send_messages(self, queue, messages):
-        s = self.connect().session()
-        sender = s.sender(queue+"; {create:always}")
+    
+    def _prep_sender(self, queue, durable, xprops):
+        s = queue + "; {create:always, node-properties:{durable:" + 
str(durable)
+        if xprops != None: s += ", x-properties:{" + xprops + "}"
+        return s + "}}"
+
+    def send_message(self, queue, message, durable=True, xprops=None, 
session=None):
+        if session == None:
+            s = self.connect().session()
+        else:
+            s = session
+        s.sender(self._prep_sender(queue, durable, xprops)).send(message)
+        if session == None:
+            s.connection.close()
+
+    def send_messages(self, queue, messages, durable=True, xprops=None, 
session=None):
+        if session == None:
+            s = self.connect().session()
+        else:
+            s = session
+        sender = s.sender(self._prep_sender(queue, durable, xprops))
         for m in messages: sender.send(m)
-        s.connection.close()
+        if session == None:
+            s.connection.close()
 
     def get_message(self, queue):
         s = self.connect().session()



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:[email protected]

Reply via email to