Merge pull request #218 from AntelopeIO/GH-217-fix-lr-test-3.1

[3.1] Fix nodeos_retry_transaction_test.py
AntelopeIO · Sep 23, 2022 · 62ae11f · 62ae11f
2 parents 5810297 + 57fa42d
commit 62ae11f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/tests/nodeos_retry_transaction_test.py b/tests/nodeos_retry_transaction_test.py
@@ -181,7 +181,7 @@
     overdrawTransferAmount = "1001.0000 {0}".format(CORE_SYMBOL)
     Print("Transfer funds %s from account %s to %s" % (overdrawTransferAmount, overdrawAccount.name, cluster.eosioAccount.name))
     overdrawtrans = node.transferFunds(overdrawAccount, cluster.eosioAccount, overdrawTransferAmount, "test overdraw transfer", exitOnError=False, reportStatus=False, retry=1)
-    assert "overdrawn balance" in str(overdrawtrans), "ERROR: Overdraw transaction attempt should have failed with overdrawn balance."
+    assert overdrawtrans is None, f"ERROR: Overdraw transaction attempt should have failed with overdrawn balance: {overdrawtrans}"
 
     def cacheTransIdInBlock(transId, transToBlock, node):
         global lastIrreversibleBlockNum

diff --git a/tests/testUtils.py b/tests/testUtils.py
@@ -204,7 +204,6 @@ def checkDelayedOutput(popen, cmd, ignoreError=False):
         (output,error)=popen.communicate()
         Utils.checkOutputFileWrite(start, cmd, output, error)
         if popen.returncode != 0 and not ignoreError:
-            Utils.Print("ERROR: %s" % error)
             # for now just include both stderr and stdout in output, python 3.5+ supports both a stdout and stderr attributes
             raise subprocess.CalledProcessError(returncode=popen.returncode, cmd=cmd, output=error+bytes(" ", 'utf-8')+output)
         return output.decode("utf-8")