Merge branch 'develop-boxed' into fsh-EPE-2034-sync-to-chain

tests/CMakeLists.txt

@@ -101,6 +101,8 @@ if (DEFINED AMQP_CONN_STR)
   set_property(TEST amqp_tests-rabbit PROPERTY LABELS nonparallelizable_tests)
   add_test(NAME nodeos_high_transaction_lr_test-rabbitmq COMMAND tests/nodeos_high_transaction_test.py --amqp-address ${AMQP_CONN_STR} -v --clean-run --dump-error-detail -p 4 -n 8 --num-transactions 10000 --max-transactions-per-second 500 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
   set_property(TEST nodeos_high_transaction_lr_test-rabbitmq PROPERTY LABELS long_running_tests)
+  add_test(NAME distributed-transactions-test-rabbitmq COMMAND tests/distributed-transactions-test.py -d 2 -p 4 -n 6 -v --clean-run --dump-error-detail --amqp-address ${AMQP_CONN_STR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+  set_property(TEST distributed-transactions-test-rabbitmq PROPERTY LABELS nonparallelizable_tests)
 endif()
 
 add_test(NAME producer-preactivate-feature-test COMMAND tests/prod_preactivation_test.py --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})

tests/distributed-transactions-test.py

@@ -23,7 +23,7 @@
 errorExit=Utils.errorExit
 
 args=TestHelper.parse_args({"-p","-n","-d","-s","--nodes-file","--seed"
-                           ,"--dump-error-details","-v","--leave-running","--clean-run","--keep-logs"})
+                           ,"--dump-error-details","-v","--leave-running","--clean-run","--keep-logs","--amqp-address"})
 
 pnodes=args.p
 topo=args.s
@@ -37,6 +37,7 @@
 dumpErrorDetails=args.dump_error_details
 killAll=args.clean_run
 keepLogs=args.keep_logs
+amqpAddr=args.amqp_address
 
 killWallet=not dontKill
 killEosInstances=not dontKill
@@ -74,8 +75,12 @@
                (pnodes, total_nodes-pnodes, topo, delay))
 
         Print("Stand up cluster")
-        traceNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis "
-        if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay, extraNodeosArgs=traceNodeosArgs) is False:
+        extraNodeosArgs=" --plugin eosio::trace_api_plugin --trace-no-abis "
+        if amqpAddr:
+            cluster.createAMQPQueue("trx")
+            extraNodeosArgs+="--plugin eosio::amqp_trx_plugin --amqp-trx-ack-mode=executed --amqp-trx-speculative-execution --amqp-trx-address %s" % (amqpAddr)
+
+        if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, topo=topo, delay=delay, extraNodeosArgs=extraNodeosArgs) is False:
             errorExit("Failed to stand up eos cluster.")
 
         Print ("Wait for Cluster stabilization")