diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b359f3be12..b4dc91342d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -188,6 +188,8 @@ set_property(TEST nodeos_snapshot_diff_test PROPERTY LABELS nonparallelizable_te #set_property(TEST nodeos_snapshot_diff_if_test PROPERTY LABELS nonparallelizable_tests) add_test(NAME nodeos_snapshot_forked_test COMMAND tests/nodeos_snapshot_forked_test.py -v ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) set_property(TEST nodeos_snapshot_forked_test PROPERTY LABELS nonparallelizable_tests) +add_test(NAME nodeos_snapshot_forked_if_test COMMAND tests/nodeos_snapshot_forked_test.py -v --activate-if ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) +set_property(TEST nodeos_snapshot_forked_if_test PROPERTY LABELS nonparallelizable_tests) add_test(NAME trx_finality_status_test COMMAND tests/trx_finality_status_test.py -v ${UNSHARE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) set_property(TEST trx_finality_status_test PROPERTY LABELS nonparallelizable_tests) diff --git a/tests/nodeos_snapshot_forked_test.py b/tests/nodeos_snapshot_forked_test.py index 6afe803385..c61372c1e4 100755 --- a/tests/nodeos_snapshot_forked_test.py +++ b/tests/nodeos_snapshot_forked_test.py @@ -20,7 +20,7 @@ Print=Utils.Print errorExit=Utils.errorExit -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 @@ -29,6 +29,7 @@ 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 @@ -80,7 +81,7 @@ def getSnapshotsCount(nodeId): # "bridge" shape connects defprocera through defproducerb (in node0) to each other and defproducerc is alone (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, extraNodeosArgs=extraNodeosArgs) is False: Utils.cmdError("launcher")