[rhmessaging-commits] rhmessaging commits: r3698 - store/trunk/cpp/tests/python_tests.

Author: kpvdr Date: 2009-11-04 14:24:20 -0500 (Wed, 04 Nov 2009) New Revision: 3698 Modified: store/trunk/cpp/tests/python_tests/flow_to_disk.py Log: Fix to flow-to-disk test non-unique XID problem which was causing tests to fail if transactions were left hanging. Modified: store/trunk/cpp/tests/python_tests/flow_to_disk.py =================================================================== --- store/trunk/cpp/tests/python_tests/flow_to_disk.py 2009-11-04 18:17:43 UTC (rev 3697) +++ store/trunk/cpp/tests/python_tests/flow_to_disk.py 2009-11-04 19:24:20 UTC (rev 3698) @@ -19,7 +19,7 @@ # # The GNU Lesser General Public License is available in the file COPYING. -import random, time +import random, time, uuid from qpid.client import Client, Closed from qpid.queue import Empty from qpid.testlib import TestBase010 @@ -37,7 +37,7 @@ def _browse(self, queueName, destinationTag, acquireMode, numMsgs, msgSize, txnConsume): txid = None if txnConsume: - txid = self._makeXid("consumer-xid-%s" % queueName) + txid = self._makeXid() self.session.dtx_select() self.assertEqual(self.XA_OK, self.session.dtx_start(xid=txid).status) self.session.message_subscribe(queue=queueName, destination=destinationTag, acquire_mode=acquireMode) @@ -93,14 +93,12 @@ msg += chr(ord('a') + (i % 26)) return msg - def _makeXid(self, txid): - self.txCounter += 1 - branchqual = "v%s" % self.txCounter - return self.session.xid(format=0, global_id=txid, branch_id=branchqual) + def _makeXid(self): + return self.session.xid(format=0, global_id=uuid.uuid4().bytes, branch_id="") def _produceDirect(self, queueName, deliveryMode, numMsgs, msgSize, txnProduce): if txnProduce: - txid = self._makeXid("producer-xid-%s" % queueName) + txid = self._makeXid() self.session.dtx_select() self.assertEqual(self.XA_OK, self.session.dtx_start(xid=txid).status) for msgNum in range(0, numMsgs): @@ -114,7 +112,7 @@ def _produceFanout(self, exchangeName, deliveryMode, numMsgs, msgSize, txnProduce, fail_on_msg): if txnProduce: - txid = self._makeXid("producer-xid-%s" % exchangeName) + txid = self._makeXid() self.session.dtx_select() self.assertEqual(self.XA_OK, self.session.dtx_start(xid=txid).status) try: