Permalink
Browse files

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

ffff866 [qa] Remove misleading "errorString syntax" (MarcoFalke)
  • Loading branch information...
laanwj committed Apr 6, 2016
2 parents 1b2460b + ffff866 commit 70ac71b877f3d792548e711f10cd3af428feb16f
Showing with 16 additions and 19 deletions.
  1. +6 −4 qa/rpc-tests/importprunedfunds.py
  2. +3 −3 qa/rpc-tests/rawtransactions.py
  3. +7 −12 qa/rpc-tests/wallet.py
@@ -83,9 +83,10 @@ def run_test (self):
try:
result1 = self.nodes[1].importprunedfunds(rawtxn1, proof1, "")
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)
assert_equal(balance1, Decimal(0))
@@ -120,9 +121,10 @@ def run_test (self):
try:
self.nodes[1].removeprunedfunds(txnid1)
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))
assert_equal(balance1, Decimal('0.075'))
@@ -56,13 +56,13 @@ def run_test(self):
rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
rawtx = self.nodes[2].signrawtransaction(rawtx)
errorString = ""
try:
rawtx = self.nodes[2].sendrawtransaction(rawtx['hex'])
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 #
View
@@ -245,22 +245,20 @@ def run_test (self):
txObj = self.nodes[0].gettransaction(txId)
assert_equal(txObj['amount'], Decimal('-0.0001'))
#this should fail
errorString = ""
try:
txId = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), "1f-4")
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:
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:
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
cbAddr = self.nodes[1].getnewaddress()
@@ -269,10 +267,7 @@ def run_test (self):
self.sync_all()
# Check that the txid and balance is found by node1
try:
self.nodes[1].gettransaction(cbTxId)
except JSONRPCException as e:
assert("Invalid or non-wallet transaction id" not in e.error['message'])
self.nodes[1].gettransaction(cbTxId)
#check if wallet or blochchain maintenance changes the balance
self.sync_all()

0 comments on commit 70ac71b

Please sign in to comment.