A few fixes for integration tests (#3263)

* Wait a little bit longer in wallet-encryption.py

The timed wallet locking is happening by an asynchronous task internally,
which means that it might need a little bit longer then the specified
timeout.

* Add workaround for p2p-versionbits-warnings.py until we backport bitcoin#12264
This commit is contained in:
Alexander Block 2020-01-02 18:36:17 +01:00 committed by UdjinM6
parent 6e50a7b2a1
commit 1df3c67a8c
2 changed files with 6 additions and 1 deletions

View File

@ -109,6 +109,11 @@ class VersionBitsWarningTest(BitcoinTestFramework):
pass
self.start_nodes()
# TODO this is a workaround. We have to wait for IBD to finish before we generate a block, as otherwise there
# won't be any warning generated. This workaround must be removed when we backport https://github.com/bitcoin/bitcoin/pull/12264
self.nodes[0].generate(1)
time.sleep(5)
# Connecting one block should be enough to generate an error.
self.nodes[0].generate(1)
assert(WARN_UNKNOWN_RULES_ACTIVE in self.nodes[0].getinfo()["errors"])

View File

@ -39,7 +39,7 @@ class WalletEncryptionTest(BitcoinTestFramework):
assert_equal(privkey, self.nodes[0].dumpprivkey(address))
# Check that the timeout is right
time.sleep(2)
time.sleep(4) # Wait a little bit longer to make sure wallet gets locked
assert_raises_rpc_error(-13, "Please enter the wallet passphrase with walletpassphrase first", self.nodes[0].dumpprivkey, address)
# Test wrong passphrase