Author: gordonsim
Date: 2007-09-21 12:41:22 -0400 (Fri, 21 Sep 2007)
New Revision: 937
Modified:
store/trunk/cpp/tests/persistence.py
store/trunk/cpp/tests/system_test.sh
Log:
Move to preview file for 0-10 (transitional has been deleted)
Remove channel_open/close with session equivalents
Use message_subscriber instead of message_get
Modified: store/trunk/cpp/tests/persistence.py
===================================================================
--- store/trunk/cpp/tests/persistence.py 2007-09-21 11:18:17 UTC (rev 936)
+++ store/trunk/cpp/tests/persistence.py 2007-09-21 16:41:22 UTC (rev 937)
@@ -56,12 +56,9 @@
channel.queue_declare(queue="queue-b", durable=True, passive=True)
#check expected messages are there
- reply = channel.message_get(destination="incoming-gets",
queue="queue-a")
- self.assertExpectedGetResult("Msg0001", "A_Message1")
+ self.assertMessageOnQueue("queue-a", "Msg0001",
"A_Message1")
+ self.assertMessageOnQueue("queue-b", "Msg0002",
"B_Message1")
- reply = channel.message_get(destination="incoming-gets",
queue="queue-b")
- self.assertExpectedGetResult("Msg0002",
"B_Message1").complete()
-
self.assertEmptyQueue("queue-a")
self.assertEmptyQueue("queue-b")
@@ -86,15 +83,10 @@
channel.tx_select()
#check expected messages are there
- reply = channel.message_get(destination="incoming-gets",
queue="queue-a")
- self.assertExpectedGetResult("Msg0003", "AB_Message2")
+ self.assertMessageOnQueue("queue-a", "Msg0003",
"AB_Message2")
+ self.assertMessageOnQueue("queue-b", "Msg0003",
"AB_Message2")
+ self.assertMessageOnQueue("queue-c", "Msg0003",
"AB_Message2")
- reply = channel.message_get(destination="incoming-gets",
queue="queue-b")
- self.assertExpectedGetResult("Msg0003", "AB_Message2")
-
- reply = channel.message_get(destination="incoming-gets",
queue="queue-c")
- self.assertExpectedGetResult("Msg0003",
"AB_Message2").complete()
-
self.assertEmptyQueue("queue-a")
self.assertEmptyQueue("queue-b")
self.assertEmptyQueue("queue-c")
@@ -141,12 +133,9 @@
channel.queue_declare(queue="queue-a", durable=True, passive=True)
channel.queue_declare(queue="queue-b", durable=True, passive=True)
- reply = channel.message_get(destination="incoming-gets",
queue="queue-a", no_ack=True)
- self.assertExpectedGetResult("Msg0004", "A_Message3")
- reply = channel.message_get(destination="incoming-gets",
queue="queue-a", no_ack=True)
- self.assertExpectedGetResult("Msg0005", "A_Message4")
- reply = channel.message_get(destination="incoming-gets",
queue="queue-a", no_ack=True)
- self.assertExpectedGetResult("Msg0006", "A_Message5")
+ self.assertMessageOnQueue("queue-a", "Msg0004",
"A_Message3")
+ self.assertMessageOnQueue("queue-a", "Msg0005",
"A_Message4")
+ self.assertMessageOnQueue("queue-a", "Msg0006",
"A_Message5")
self.assertEmptyQueue("queue-a")
self.assertEmptyQueue("queue-b")
@@ -158,7 +147,7 @@
except Closed, e:
self.assertChannelException(404, e.args[0])
self.channel = self.client.channel(2)
- self.channel.channel_open()
+ self.channel.session_open()
channel = self.channel
def phase5(self):
@@ -266,8 +255,11 @@
def txswap(self, src, dest, tx):
self.assertEqual(self.XA_OK, self.channel.dtx_demarcation_start(xid=tx).status)
- self.channel.message_get(destination="temp-swap", queue=src)
+ self.channel.message_subscribe(destination="temp-swap", queue=src,
confirm_mode=1)
+ self.channel.message_flow(destination="temp-swap", unit=0, value=1)
+ self.channel.message_flow(destination="temp-swap", unit=1,
value=0xFFFFFFFF)
msg = self.client.queue("temp-swap").get(timeout=1)
+ self.channel.message_cancel(destination="temp-swap")
self.channel.message_transfer(content=Content(properties={'routing_key':dest,
'message_id':msg.content['message_id'], 'delivery_mode':2},
body=msg.content.body))
msg.complete();
@@ -277,8 +269,8 @@
self.assertEqual(0, self.channel.queue_query(queue=name).message_count)
def assertChannelException(self, expectedCode, message):
- self.assertEqual("channel", message.method.klass.name)
- self.assertEqual("close", message.method.name)
+ self.assertEqual("session", message.method.klass.name)
+ self.assertEqual("closed", message.method.name)
self.assertEqual(expectedCode, message.reply_code)
def assertConnectionException(self, expectedCode, message):
@@ -296,11 +288,21 @@
return content
def assertExpectedGetResult(self, id, body):
- return
self.assertExpectedContent(self.client.queue("incoming-gets").get(timeout=1),
id, body)
+ return
self.assertExpectedContent(self.client.queue("incoming-gets").get(timeout=1),
id, body)
def assertEqual(self, expected, actual, msg=''):
if expected != actual: raise Exception("%s expected: %s actual: %s" %
(msg, expected, actual))
+ def assertMessageOnQueue(self, queue, id, body):
+ self.channel.message_subscribe(destination="incoming-gets",
queue=queue, confirm_mode=1)
+ self.channel.message_flow(destination="incoming-gets", unit=0,
value=1)
+ self.channel.message_flow(destination="incoming-gets", unit=1,
value=0xFFFFFFFF)
+ msg = self.client.queue("incoming-gets").get(timeout=1)
+ self.assertExpectedContent(msg, id, body)
+ msg.complete()
+ self.channel.message_cancel(destination="incoming-gets")
+
+
def __init__(self):
self.setBroker("localhost")
self.errata = []
@@ -310,7 +312,7 @@
self.client = qpid.client.Client(self.host, self.port, qpid.spec.load(self.spec,
*self.errata))
self.client.start({"LOGIN": self.user, "PASSWORD":
self.password})
self.channel = self.client.channel(1)
- self.channel.channel_open()
+ self.channel.session_open()
def connect_with_retry(self, retry):
for r in range(1, retry + 1):
@@ -351,7 +353,7 @@
traceback.print_exc()
- self.channel.channel_close()
+ self.channel.session_close()
return True
Modified: store/trunk/cpp/tests/system_test.sh
===================================================================
--- store/trunk/cpp/tests/system_test.sh 2007-09-21 11:18:17 UTC (rev 936)
+++ store/trunk/cpp/tests/system_test.sh 2007-09-21 16:41:22 UTC (rev 937)
@@ -43,10 +43,8 @@
. $abs_srcdir/setup
# Make sure $QPID_DIR contains what we need.
-xml_spec=$QPID_DIR/specs/amqp-transitional.0-10.xml
-spec_errata=$QPID_DIR/specs/amqp-errata.0-9.xml
-dtx_preview=$QPID_DIR/specs/amqp-dtx-preview.0-9.xml
-test -f $xml_spec -a -f $spec_errata -a -f $dtx_preview || {
+xml_spec=$QPID_DIR/specs/amqp.0-10-preview.xml
+test -f $xml_spec || {
echo "$xml_spec or $spec_errata or $dtx_preview not found: invalid \$QPID_DIR
?"; exit 1; }
export DB_HOME=dbdata