From e1f97277f5ee1f1be2967dba8655b866e5a8c0ed Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Tue, 30 Jan 2024 13:35:13 -0600 Subject: [PATCH] GH-1510 Add nodeos_retry_transaction_if_lr_test --- tests/CMakeLists.txt | 2 ++ tests/nodeos_retry_transaction_test.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 11a50d5f4a..2c8db2c581 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -272,6 +272,8 @@ set_property(TEST nodeos_high_transaction_if_lr_test PROPERTY LABELS long_runnin add_test(NAME nodeos_retry_transaction_lr_test COMMAND tests/nodeos_retry_transaction_test.py -v --num-transactions 100 --max-transactions-per-second 10 --total-accounts 5 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) set_property(TEST nodeos_retry_transaction_lr_test PROPERTY LABELS long_running_tests) +add_test(NAME nodeos_retry_transaction_if_lr_test COMMAND tests/nodeos_retry_transaction_test.py -v --activate-if --num-transactions 100 --max-transactions-per-second 10 --total-accounts 5 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +set_property(TEST nodeos_retry_transaction_if_lr_test PROPERTY LABELS long_running_tests) add_test(NAME cli_test COMMAND tests/cli_test.py WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) set_property(TEST cli_test PROPERTY LABELS nonparallelizable_tests) diff --git a/tests/nodeos_retry_transaction_test.py b/tests/nodeos_retry_transaction_test.py index d1b82388da..c29e6f4a1c 100755 --- a/tests/nodeos_retry_transaction_test.py +++ b/tests/nodeos_retry_transaction_test.py @@ -31,7 +31,7 @@ extraArgs = appArgs.add(flag="--num-transactions", type=int, help="How many total transactions should be sent", default=1000) extraArgs = appArgs.add(flag="--max-transactions-per-second", type=int, help="How many transactions per second should be sent", default=50) extraArgs = appArgs.add(flag="--total-accounts", type=int, help="How many accounts should be involved in sending transfers. Must be greater than %d" % (minTotalAccounts), default=10) -args = TestHelper.parse_args({"--dump-error-details","--keep-logs","-v","--leave-running","--unshared"}, applicationSpecificArgs=appArgs) +args = TestHelper.parse_args({"--activate-if","--dump-error-details","--keep-logs","-v","--leave-running","--unshared"}, applicationSpecificArgs=appArgs) Utils.Debug=args.v totalProducerNodes=3 @@ -40,6 +40,7 @@ maxActiveProducers=totalProducerNodes totalProducers=totalProducerNodes cluster=Cluster(unshared=args.unshared, keepRunning=args.leave_running, keepLogs=args.keep_logs) +activateIF=args.activate_if dumpErrorDetails=args.dump_error_details walletPort=TestHelper.DEFAULT_WALLET_PORT blocksPerSec=2 @@ -77,7 +78,7 @@ # topo=ring all nodes are connected in a ring but also to the bios node if cluster.launch(pnodes=totalProducerNodes, totalNodes=totalNodes, totalProducers=totalProducers, - topo="ring", + topo="ring", activateIF=activateIF, specificExtraNodeosArgs=specificExtraNodeosArgs) is False: Utils.cmdError("launcher") Utils.errorExit("Failed to stand up eos cluster.")