diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a56462b5f9..b53eb0d9dc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -258,6 +258,8 @@ set_property(TEST nodeos_startup_catchup_if_lr_test PROPERTY LABELS long_running add_test(NAME nodeos_short_fork_take_over_test COMMAND tests/nodeos_short_fork_take_over_test.py -v --wallet-port 9905 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) set_property(TEST nodeos_short_fork_take_over_test PROPERTY LABELS nonparallelizable_tests) +add_test(NAME nodeos_short_fork_take_over_if_test COMMAND tests/nodeos_short_fork_take_over_test.py -v --activate-if --wallet-port 9905 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +set_property(TEST nodeos_short_fork_take_over_if_test PROPERTY LABELS nonparallelizable_tests) add_test(NAME nodeos_extra_packed_data_test COMMAND tests/nodeos_extra_packed_data_test.py -v -p 2 ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) set_property(TEST nodeos_extra_packed_data_test PROPERTY LABELS nonparallelizable_tests) diff --git a/tests/nodeos_short_fork_take_over_test.py b/tests/nodeos_short_fork_take_over_test.py index f468cae52c..3e550c63e5 100755 --- a/tests/nodeos_short_fork_take_over_test.py +++ b/tests/nodeos_short_fork_take_over_test.py @@ -105,7 +105,7 @@ def getMinHeadAndLib(prodNodes): -args = TestHelper.parse_args({"--prod-count","--dump-error-details","--keep-logs","-v","--leave-running", +args = TestHelper.parse_args({"--prod-count","--activate-if","--dump-error-details","--keep-logs","-v","--leave-running", "--wallet-port","--unshared"}) Utils.Debug=args.v totalProducerNodes=2 @@ -114,6 +114,7 @@ def getMinHeadAndLib(prodNodes): maxActiveProducers=3 totalProducers=maxActiveProducers cluster=Cluster(unshared=args.unshared, keepRunning=args.leave_running, keepLogs=args.keep_logs) +activateIF=args.activate_if dumpErrorDetails=args.dump_error_details walletPort=args.wallet_port @@ -138,7 +139,7 @@ def getMinHeadAndLib(prodNodes): # "bridge" shape connects defprocera through defproducerk (in node0) to each other and defproducerl through defproduceru (in node01) # and the only connection between those 2 groups is through the bridge node if cluster.launch(prodCount=2, topo="bridge", pnodes=totalProducerNodes, - totalNodes=totalNodes, totalProducers=totalProducers, + totalNodes=totalNodes, totalProducers=totalProducers, activateIF=activateIF, specificExtraNodeosArgs=specificExtraNodeosArgs, onlySetProds=True) is False: Utils.cmdError("launcher") Utils.errorExit("Failed to stand up eos cluster.")