aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-04-03 21:20:14 +0200
committerMarcoFalke <falke.marco@gmail.com>2016-04-03 21:33:56 +0200
commitffff866da83209dcaa463d8b9539d3f539f83a97 (patch)
treed1adb0a90470bee083786f288ca8a9c46a29ae8f
parente662a76288011fe6a640f1c02c2381284ad93a03 (diff)
[qa] Remove misleading "errorString syntax"
-rwxr-xr-xqa/rpc-tests/importprunedfunds.py10
-rwxr-xr-xqa/rpc-tests/rawtransactions.py6
-rwxr-xr-xqa/rpc-tests/wallet.py19
3 files changed, 16 insertions, 19 deletions
diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
index db875800d4..a9324196ee 100755
--- a/qa/rpc-tests/importprunedfunds.py
+++ b/qa/rpc-tests/importprunedfunds.py
@@ -83,9 +83,10 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
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 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
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'))
diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py
index 9f660c8bda..762a6d6a30 100755
--- a/qa/rpc-tests/rawtransactions.py
+++ b/qa/rpc-tests/rawtransactions.py
@@ -56,13 +56,13 @@ class RawTransactionsTest(BitcoinTestFramework):
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 #
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index cb876aae5c..8fdcea50b6 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -245,22 +245,20 @@ class WalletTest (BitcoinTestFramework):
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 @@ class WalletTest (BitcoinTestFramework):
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()