More comprehensive C++ API transaction tests

Author: astitcher

tests/cpp/test_tx_tester.py

@@ -19,7 +19,9 @@
 
 """Run tx_tester -f scripts against python/examples/broker.py."""
 
+import glob
 import os
+import re
 import socket
 import subprocess
 import time
@@ -49,6 +51,29 @@ def _wait_for_port(host, port, attempts=100, interval=0.1):
     raise RuntimeError(f"timed out waiting for {host}:{port}")
 
 
+def _discover_tx_test_scripts():
+    script_dir = os.environ.get("TX_TESTER_SCRIPTS")
+    if not script_dir:
+        return []
+    pattern = os.path.join(script_dir, "*.tx_test")
+    return sorted(os.path.basename(path) for path in glob.glob(pattern))
+
+
+def _test_method_name(script_name):
+    stem = script_name.removesuffix(".tx_test")
+    safe = re.sub(r"[^0-9A-Za-z_]", "_", stem)
+    return f"test_{safe}"
+
+
+def _make_tx_test_method(script_name):
+    def test_method(self):
+        self.run_tx_test(script_name)
+
+    test_method.__name__ = _test_method_name(script_name)
+    test_method.__doc__ = f"Run tx_tester script {script_name}."
+    return test_method
+
+
 class TxTesterBrokerTest(unittest.TestCase):
     """Shared broker fixture for tx_tester script files."""
 
@@ -75,6 +100,7 @@ def setUpClass(cls):
                 f"port {cls.port} already in use; stop other brokers before running"
             )
 
+        # Future: TX_TESTER_BROKER_CMD / TX_TESTER_BROKER_URL for other brokers.
         cls.broker = subprocess.Popen(
             [cls.python, cls.broker_script, "-t", cls.txn_timeout],
             stdout=subprocess.PIPE,
@@ -118,24 +144,15 @@ def run_tx_test(self, script_name):
             )
 
 
-class TestDeclare(TxTesterBrokerTest):
-    def test_declare(self):
-        self.run_tx_test("declare.tx_test")
-
-
-class TestCommitTimeout(TxTesterBrokerTest):
-    def test_commit_timeout(self):
-        self.run_tx_test("commit_timeout.tx_test")
-
+class TestTxScriptSuite(TxTesterBrokerTest):
+    """One test method per *.tx_test script (methods added at import time)."""
 
-class TestExplicitAbort(TxTesterBrokerTest):
-    def test_explicit_abort(self):
-        self.run_tx_test("explicit_abort.tx_test")
+    pass
 
 
-class Test1(TxTesterBrokerTest):
-    def test1(self):
-        self.run_tx_test("test1.tx_test")
+for _script_name in _discover_tx_test_scripts():
+    _method = _make_tx_test_method(_script_name)
+    setattr(TestTxScriptSuite, _method.__name__, _method)
 
 
 if __name__ == "__main__":

tests/cpp/tx_tests/00_setup_seed_messages.tx_test

@@ -0,0 +1,6 @@
+# Setup: seed the examples queue with messages for later receive tests.
+# (Not an AMQP transaction test; prepares broker state for the suite.)
+send 25
+wait sent
+wait outgoing
+quit

tests/cpp/tx_tests/01_declare.tx_test

@@ -0,0 +1,7 @@
+# AMQP 1.0 §4.6.2 — declare (amqp:declare:list) returns declared disposition with txn-id.
+declare
+wait declared
+expect ok $last_declare
+expect true $txn_declared
+expect @not @empty $txn_id
+quit

tests/cpp/tx_tests/02_commit_empty.tx_test

@@ -0,0 +1,9 @@
+# AMQP 1.0 §4.6.3 — discharge with fail=false (commit) completes successfully.
+declare
+wait declared
+commit
+wait discharged
+expect committed $last_discharge
+expect false $txn_declared
+expect @empty $error
+quit

tests/cpp/tx_tests/03_explicit_abort.tx_test

@@ -0,0 +1,9 @@
+# AMQP 1.0 §4.6.3 — discharge with fail=true (rollback) completes without error.
+declare
+wait declared
+abort
+wait discharged
+expect aborted $last_discharge
+expect false $txn_declared
+expect @empty $error
+quit

tests/cpp/tx_tests/04_commit_timeout.tx_test

@@ -0,0 +1,11 @@
+# AMQP 1.0 §4.6.3 + amqp:transaction:timeout — broker rejects commit after txn age exceeds limit.
+declare
+wait declared
+wait 3
+reset_status
+commit
+wait discharged
+expect aborted $last_discharge
+expect @not @empty $error
+expect false $txn_declared
+quit

tests/cpp/tx_tests/05_incoming_accept_commit.tx_test

@@ -0,0 +1,13 @@
+# AMQP 1.0 §4.4 / amqp:transactional-state:list — provisional accept finalized on commit.
+declare
+wait declared
+fetch 1
+wait fetched 1
+accept
+expect 1 $unsettled_in
+commit
+wait discharged
+expect committed $last_discharge
+expect 0 $unsettled_in
+expect @empty $error
+quit

tests/cpp/tx_tests/06_incoming_accept_abort.tx_test

@@ -0,0 +1,18 @@
+# AMQP 1.0 §4.6.3 — rollback of provisional accept; message remains available for delivery.
+declare
+wait declared
+fetch 1
+wait fetched 1
+accept
+expect 1 $unsettled_in
+abort
+wait discharged
+expect aborted $last_discharge
+expect 0 $unsettled_in
+expect @empty $error
+declare
+wait declared
+fetch 1
+wait 5 fetched 1
+expect 1 $fetch
+quit

tests/cpp/tx_tests/07_incoming_reject_commit.tx_test

@@ -0,0 +1,13 @@
+# AMQP 1.0 §4.4 / amqp:transactional-state:list — provisional reject finalized on commit.
+declare
+wait declared
+fetch 1
+wait fetched 1
+reject
+expect 1 $unsettled_in
+commit
+wait discharged
+expect committed $last_discharge
+expect 0 $unsettled_in
+expect @empty $error
+quit

tests/cpp/tx_tests/08_incoming_release_commit.tx_test

@@ -0,0 +1,17 @@
+# AMQP 1.0 §4.4 / amqp:transactional-state:list — provisional release finalized on commit (requeue).
+declare
+wait declared
+fetch 1
+wait fetched 1
+release
+expect 1 $unsettled_in
+commit
+wait discharged
+expect committed $last_discharge
+expect 0 $unsettled_in
+declare
+wait declared
+fetch 1
+wait 5 fetched 1
+expect 1 $fetch
+quit