diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-03 15:35:59 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-03 15:54:35 +0200 |
| commit | ff5874bcf7e391acf3b454c11c21636547400818 (patch) | |
| tree | 5bf4080f939dcb44923edb98f3f13fdf9ae897f3 /qa/rpc-tests/disablewallet.py | |
| parent | e0b3e19816b62fdf6faeda44459f30945241fbd8 (diff) | |
| parent | 444480649f08e6037f8ac178224b30a82e9ad72e (diff) | |
Merge #7778: [qa] Bug fixes and refactor
4444806 [qa] mininode: Combine struct.pack format strings (MarcoFalke)
faaa3c9 [qa] mininode: Catch exceptions in got_data (MarcoFalke)
fa2cea1 [qa] rpc-tests: Properly use integers, floats (MarcoFalke)
fa524d9 [qa] Use python2/3 syntax (MarcoFalke)
Diffstat (limited to 'qa/rpc-tests/disablewallet.py')
| -rwxr-xr-x | qa/rpc-tests/disablewallet.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/rpc-tests/disablewallet.py b/qa/rpc-tests/disablewallet.py index 5af8158467..cb868029fa 100755 --- a/qa/rpc-tests/disablewallet.py +++ b/qa/rpc-tests/disablewallet.py @@ -32,7 +32,7 @@ class DisableWalletTest (BitcoinTestFramework): # Checking mining to an address without a wallet try: self.nodes[0].generatetoaddress(1, 'mneYUmWYsuk7kySiURxCi3AGxrAqZxLgPZ') - except JSONRPCException,e: + except JSONRPCException as e: assert("Invalid address" not in e.error['message']) assert("ProcessNewBlock, block not accepted" not in e.error['message']) assert("Couldn't create new block" not in e.error['message']) @@ -40,7 +40,7 @@ class DisableWalletTest (BitcoinTestFramework): try: self.nodes[0].generatetoaddress(1, '3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy') raise AssertionError("Must not mine to invalid address!") - except JSONRPCException,e: + except JSONRPCException as e: assert("Invalid address" in e.error['message']) if __name__ == '__main__': |