Browse Source

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

ffff866 [qa] Remove misleading "errorString syntax" (MarcoFalke)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
70ac71b877
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 10
      qa/rpc-tests/importprunedfunds.py
  2. 6
      qa/rpc-tests/rawtransactions.py
  3. 17
      qa/rpc-tests/wallet.py

10
qa/rpc-tests/importprunedfunds.py

@ -83,9 +83,10 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
try: try:
result1 = self.nodes[1].importprunedfunds(rawtxn1, proof1, "") result1 = self.nodes[1].importprunedfunds(rawtxn1, proof1, "")
except JSONRPCException as 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, True) balance1 = self.nodes[1].getbalance("", 0, True)
assert_equal(balance1, Decimal(0)) assert_equal(balance1, Decimal(0))
@ -120,9 +121,10 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
try: try:
self.nodes[1].removeprunedfunds(txnid1) self.nodes[1].removeprunedfunds(txnid1)
except JSONRPCException as 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, True)) balance1 = Decimal(self.nodes[1].getbalance("", 0, True))
assert_equal(balance1, Decimal('0.075')) assert_equal(balance1, Decimal('0.075'))

6
qa/rpc-tests/rawtransactions.py

@ -56,13 +56,13 @@ class RawTransactionsTest(BitcoinTestFramework):
rawtx = self.nodes[2].createrawtransaction(inputs, outputs) rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
rawtx = self.nodes[2].signrawtransaction(rawtx) rawtx = self.nodes[2].signrawtransaction(rawtx)
errorString = ""
try: try:
rawtx = self.nodes[2].sendrawtransaction(rawtx['hex']) rawtx = self.nodes[2].sendrawtransaction(rawtx['hex'])
except JSONRPCException as e: except JSONRPCException as e:
errorString = e.error['message'] assert("Missing inputs" in e.error['message'])
else:
assert(False)
assert("Missing inputs" in errorString)
######################### #########################
# RAW TX MULTISIG TESTS # # RAW TX MULTISIG TESTS #

17
qa/rpc-tests/wallet.py

@ -245,22 +245,20 @@ class WalletTest (BitcoinTestFramework):
txObj = self.nodes[0].gettransaction(txId) txObj = self.nodes[0].gettransaction(txId)
assert_equal(txObj['amount'], Decimal('-0.0001')) assert_equal(txObj['amount'], Decimal('-0.0001'))
#this should fail
errorString = ""
try: try:
txId = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), "1f-4") txId = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), "1f-4")
except JSONRPCException as e: except JSONRPCException as e:
errorString = e.error['message'] assert("Invalid amount" in e.error['message'])
else:
raise AssertionError("Must not parse invalid amounts")
assert("Invalid amount" in errorString)
errorString = ""
try: try:
self.nodes[0].generate("2") #use a string to as block amount parameter must fail because it's not interpreted as amount self.nodes[0].generate("2")
raise AssertionError("Must not accept strings as numeric")
except JSONRPCException as e: except JSONRPCException as e:
errorString = e.error['message'] assert("not an integer" in e.error['message'])
assert("not an integer" in errorString)
# Mine a block from node0 to an address from node1 # Mine a block from node0 to an address from node1
cbAddr = self.nodes[1].getnewaddress() cbAddr = self.nodes[1].getnewaddress()
@ -269,10 +267,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 as 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()

Loading…
Cancel
Save