aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-01-18 10:55:59 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-01-18 10:56:00 +0100
commitd3dfc6d7e18e151fb980b4c301368b145ec46442 (patch)
treee6d5c8db586b7bdf929f4b34d8bdd0e123e3871d
parentb8f485c47284e2bbbdb834a5c3e34acb0a501ebd (diff)
parentfa1cb1ae15e74e6149ff7fd8aae6cba216914e4c (diff)
Merge pull request #7320
fa1cb1a [qa] Test walletpassphrase timeout (MarcoFalke)
-rwxr-xr-xqa/rpc-tests/keypool.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/qa/rpc-tests/keypool.py b/qa/rpc-tests/keypool.py
index c300bbc57e..95d0d6832a 100755
--- a/qa/rpc-tests/keypool.py
+++ b/qa/rpc-tests/keypool.py
@@ -70,9 +70,11 @@ class KeyPoolTest(BitcoinTestFramework):
assert(e.error['code']==-12)
# refill keypool with three new addresses
- nodes[0].walletpassphrase('test', 12000)
+ nodes[0].walletpassphrase('test', 1)
nodes[0].keypoolrefill(3)
- nodes[0].walletlock()
+ # test walletpassphrase timeout
+ time.sleep(1.1)
+ assert_equal(nodes[0].getwalletinfo()["unlocked_until"], 0)
# drain them by mining
nodes[0].generate(1)