mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-07-28 16:13:09 +02:00
Merge #8038: [qa, doc] Various minor fixes
fa83a5d
[qa] wallet: Temporarily disable salvagewallet test (MarcoFalke)fadd048
[doc] Link to clang-format in the developer notes (MarcoFalke)fa72f7d
[doc] Remove outdated line from listunspent RPC help, fix typo (MarcoFalke)ac40ed7
Increase timeout waiting for pruned blk00000.dat (error10)
This commit is contained in:
@@ -75,7 +75,7 @@ class PruneTest(BitcoinTestFramework):
|
||||
waitstart = time.time()
|
||||
while os.path.isfile(self.prunedir+"blk00000.dat"):
|
||||
time.sleep(0.1)
|
||||
if time.time() - waitstart > 10:
|
||||
if time.time() - waitstart > 30:
|
||||
raise AssertionError("blk00000.dat not pruned when it should be")
|
||||
|
||||
print("Success")
|
||||
|
@@ -306,7 +306,7 @@ class WalletTest (BitcoinTestFramework):
|
||||
# Check that the txid and balance is found by node1
|
||||
self.nodes[1].gettransaction(cbTxId)
|
||||
|
||||
#check if wallet or blochchain maintenance changes the balance
|
||||
# check if wallet or blockchain maintenance changes the balance
|
||||
self.sync_all()
|
||||
blocks = self.nodes[0].generate(2)
|
||||
self.sync_all()
|
||||
@@ -318,7 +318,8 @@ class WalletTest (BitcoinTestFramework):
|
||||
'-reindex',
|
||||
'-zapwallettxes=1',
|
||||
'-zapwallettxes=2',
|
||||
'-salvagewallet',
|
||||
# disabled until issue is fixed: https://github.com/bitcoin/bitcoin/issues/7463
|
||||
# '-salvagewallet',
|
||||
]
|
||||
for m in maintenance:
|
||||
print("check " + m)
|
||||
@@ -338,4 +339,4 @@ class WalletTest (BitcoinTestFramework):
|
||||
assert_equal(len(self.nodes[0].listsinceblock(blocks[1])["transactions"]), 0)
|
||||
|
||||
if __name__ == '__main__':
|
||||
WalletTest ().main ()
|
||||
WalletTest().main()
|
||||
|
Reference in New Issue
Block a user