QPID-5531: [C++ broker] Set timeout for every DTX transaction

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1564694 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 18 insertions, 2 deletions

diff --git a/qpid/tests/src/py/qpid_tests/broker_0_10/dtx.py b/qpid/tests/src/py/qpid_tests/broker_0_10/dtx.py
index f8d6533a78..a9619bcdb8 100644
--- a/qpid/tests/src/py/qpid_tests/broker_0_10/dtx.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/dtx.py
@@ -594,9 +594,10 @@ class DtxTests(TestBase010):
 
         session.dtx_select()
         session.dtx_start(xid=tx)
-        self.assertEqual(0, session.dtx_get_timeout(xid=tx).timeout)
-        session.dtx_set_timeout(xid=tx, timeout=60)
+        # below test checks for default value of dtx-default-timeout broker option
         self.assertEqual(60, session.dtx_get_timeout(xid=tx).timeout)
+        session.dtx_set_timeout(xid=tx, timeout=200)
+        self.assertEqual(200, session.dtx_get_timeout(xid=tx).timeout)
         self.assertEqual(self.XA_OK, session.dtx_end(xid=tx).status)
         self.assertEqual(self.XA_OK, session.dtx_rollback(xid=tx).status)
 
@@ -628,6 +629,21 @@ class DtxTests(TestBase010):
         self.assertEqual(self.XA_RBTIMEOUT, session.dtx_end(xid=tx).status)
         self.assertEqual(self.XA_RBTIMEOUT, session.dtx_rollback(xid=tx).status)
 
+    def test_set_timeout_too_high(self):
+        """
+        Test the timeout can't be more than --dtx-max-timeout
+        broker option
+        """
+        session = self.session
+        tx = self.xid("dummy")
+
+        session.dtx_select()
+        session.dtx_start(xid=tx)
+        try:
+            session.dtx_set_timeout(xid=tx, timeout=3601)
+        except SessionException, e:
+            self.assertEquals(542, e.args[0].error_code)
+
 
 
     def test_recover(self):