sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #7801: [qa] Remove misleading "errorString syntax"

Browse Source 
ffff866 [qa] Remove misleading "errorString syntax" (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan 2016-04-06 14:12:21 +02:00 committed by Alexander Block
parent 738e1c51c0
commit a8aeff143b
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qa/rpc-tests/importprunedfunds.py
View File

@ -82,10 +82,11 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
#Import with no affiliated address #Import with no affiliated address
try: try:
result1 = self.nodes[1].importprunedfunds(rawtxn1, proof1, "") result1 = self.nodes[1].importprunedfunds(rawtxn1, proof1, "")
except JSONRPCException,e: except JSONRPCException as e:
errorString = e.error['message'] assert('No addresses' in e.error['message'])
else:
assert(False)
assert('No addresses' in errorString)
balance1 = self.nodes[1].getbalance("", 0, False, True) balance1 = self.nodes[1].getbalance("", 0, False, True)
assert_equal(balance1, Decimal(0)) assert_equal(balance1, Decimal(0))
@ -119,10 +120,11 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
try: try:
self.nodes[1].removeprunedfunds(txnid1) self.nodes[1].removeprunedfunds(txnid1)
except JSONRPCException,e: except JSONRPCException as e:
errorString = e.error['message'] assert('does not exist' in e.error['message'])
else:
assert(False)
assert('does not exist' in errorString)
balance1 = Decimal(self.nodes[1].getbalance("", 0, False, True)) balance1 = Decimal(self.nodes[1].getbalance("", 0, False, True))
assert_equal(balance1, Decimal('0.075')) assert_equal(balance1, Decimal('0.075'))

5
qa/rpc-tests/wallet.py
View File

@ -307,10 +307,7 @@ class WalletTest (BitcoinTestFramework):
self.sync_all() self.sync_all()
# Check that the txid and balance is found by node1 # Check that the txid and balance is found by node1
try: self.nodes[1].gettransaction(cbTxId)
self.nodes[1].gettransaction(cbTxId)
except JSONRPCException,e:
assert("Invalid or non-wallet transaction id" not in e.error['message'])
#check if wallet or blochchain maintenance changes the balance #check if wallet or blochchain maintenance changes the balance
self.sync_all() self.sync_all()