Merge pull request #7320

fa1cb1a [qa] Test walletpassphrase timeout (MarcoFalke)
2016-01-18 10:55:59 +01:00 · 2016-01-18 10:55:59 +01:00 · d3dfc6d7e1
parent b8f485c472 fa1cb1ae15
commit d3dfc6d7e1
1 changed files with 4 additions and 2 deletions
--- 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)