mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 23:07:59 +01:00
Code Issues Projects Releases Wiki Activity

test: Fix intermittent failure in wallet_encryption

Browse source
This commit is contained in:
MarcoFalke 2020-07-01 20:02:05 -04:00
parent 501203aa91
commit fabd33b541
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/functional/wallet_encryption.py
View file

@ -13,6 +13,7 @@ from test_framework.util import (
assert_greater_than_or_equal, assert_greater_than_or_equal,
) )
class WalletEncryptionTest(BitcoinTestFramework): class WalletEncryptionTest(BitcoinTestFramework):
def set_test_params(self): def set_test_params(self):
self.setup_clean_chain = True self.setup_clean_chain = True
@ -72,20 +73,25 @@ class WalletEncryptionTest(BitcoinTestFramework):
# Test timeout bounds # Test timeout bounds
assert_raises_rpc_error(-8, "Timeout cannot be negative.", self.nodes[0].walletpassphrase, passphrase2, -10) assert_raises_rpc_error(-8, "Timeout cannot be negative.", self.nodes[0].walletpassphrase, passphrase2, -10)
# Check the timeout
# Check a time less than the limit self.log.info('Check a timeout less than the limit')
MAX_VALUE = 100000000 MAX_VALUE = 100000000
expected_time = int(time.time()) + MAX_VALUE - 600 expected_time = int(time.time()) + MAX_VALUE - 600
self.nodes[0].walletpassphrase(passphrase2, MAX_VALUE - 600) self.nodes[0].walletpassphrase(passphrase2, MAX_VALUE - 600)
# give buffer for walletpassphrase, since it iterates over all crypted keys
expected_time_with_buffer = time.time() + MAX_VALUE - 600
actual_time = self.nodes[0].getwalletinfo()['unlocked_until'] actual_time = self.nodes[0].getwalletinfo()['unlocked_until']
assert_greater_than_or_equal(actual_time, expected_time) assert_greater_than_or_equal(actual_time, expected_time)
assert_greater_than(expected_time + 5, actual_time) # 5 second buffer assert_greater_than(expected_time_with_buffer, actual_time)
# Check a time greater than the limit
self.log.info('Check a timeout greater than the limit')
expected_time = int(time.time()) + MAX_VALUE - 1 expected_time = int(time.time()) + MAX_VALUE - 1
self.nodes[0].walletpassphrase(passphrase2, MAX_VALUE + 1000) self.nodes[0].walletpassphrase(passphrase2, MAX_VALUE + 1000)
expected_time_with_buffer = time.time() + MAX_VALUE
actual_time = self.nodes[0].getwalletinfo()['unlocked_until'] actual_time = self.nodes[0].getwalletinfo()['unlocked_until']
assert_greater_than_or_equal(actual_time, expected_time) assert_greater_than_or_equal(actual_time, expected_time)
assert_greater_than(expected_time + 5, actual_time) # 5 second buffer assert_greater_than(expected_time_with_buffer, actual_time)
if __name__ == '__main__': if __name__ == '__main__':
WalletEncryptionTest().main() WalletEncryptionTest().main()