Merge pull request #731 from AntelopeIO/performance_harness_shutdown_…

…trxgenlauncher [PH] Add TransactionGeneratorLauncher to TestHelper Shutdown
AntelopeIO · Feb 22, 2023 · 5980ed3 · 5980ed3
2 parents 6e5cb4a + c15ed53
commit 5980ed3
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/tests/performance_tests/performance_test_basic.py b/tests/performance_tests/performance_test_basic.py
@@ -370,13 +370,13 @@ def runTpsTest(self) -> PtbTpsTestResult:
         self.data.startBlock = self.waitForEmptyBlocks(self.validationNode, self.emptyBlockGoal)
         tpsTrxGensConfig = TpsTrxGensConfig(targetTps=self.ptbConfig.targetTps, tpsLimitPerGenerator=self.ptbConfig.tpsLimitPerGenerator)
 
-        trxGenLauncher = TransactionGeneratorsLauncher(chainId=chainId, lastIrreversibleBlockId=lib_id, contractOwnerAccount=self.clusterConfig.specifiedContract.accountName,
+        self.cluster.trxGenLauncher = TransactionGeneratorsLauncher(chainId=chainId, lastIrreversibleBlockId=lib_id, contractOwnerAccount=self.clusterConfig.specifiedContract.accountName,
                                                        accts=','.join(map(str, self.accountNames)), privateKeys=','.join(map(str, self.accountPrivKeys)),
                                                        trxGenDurationSec=self.ptbConfig.testTrxGenDurationSec, logDir=self.trxGenLogDirPath,
                                                        abiFile=abiFile, actionsData=actionsDataJson, actionsAuths=actionsAuthsJson,
                                                        peerEndpoint=self.producerNode.host, port=self.producerP2pPort, tpsTrxGensConfig=tpsTrxGensConfig)
 
-        trxGenExitCodes = trxGenLauncher.launch()
+        trxGenExitCodes = self.cluster.trxGenLauncher.launch()
         print(f"Transaction Generator exit codes: {trxGenExitCodes}")
         for exitCode in trxGenExitCodes:
             if exitCode != 0:
@@ -461,7 +461,6 @@ def postTpsTestSteps(self):
 
     def runTest(self) -> bool:
         testSuccessful = False
-        completedRun = False
 
         try:
             # Kill any existing instances and launch cluster
@@ -500,10 +499,6 @@ def runTest(self) -> bool:
             if not self.ptbConfig.delPerfLogs:
                 self.captureLowLevelArtifacts()
 
-            if not completedRun:
-                os.system("pkill trx_generator")
-                print("Test run cancelled early via SIGINT")
-
             if self.ptbConfig.delPerfLogs:
                 print(f"Cleaning up logs directory: {self.loggingConfig.logDirPath}")
                 self.testDirsCleanup(self.ptbConfig.delReport)