diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-05-17 09:26:42 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-05-17 09:27:25 +0200 |
| commit | e2bf830bb6c1bfa038c943dd6f5d92a406bd723f (patch) | |
| tree | 921a28b905b8ba0dd53dd3511436892ee569e960 /qa | |
| parent | 1f01443567b03ac75a91c810f1733f5c21b5699d (diff) | |
| parent | fa83a5dbce0b76e78744c9ad5578c93e89b123e5 (diff) | |
| download | bitcoin-e2bf830bb6c1bfa038c943dd6f5d92a406bd723f.tar.xz | |
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)
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/rpc-tests/pruning.py | 2 | ||||
| -rwxr-xr-x | qa/rpc-tests/wallet.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py index 92d33bd20e..eac2272db2 100755 --- a/qa/rpc-tests/pruning.py +++ b/qa/rpc-tests/pruning.py @@ -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") diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py index 42ce0a7260..f321f5e90b 100755 --- a/qa/rpc-tests/wallet.py +++ b/qa/rpc-tests/wallet.py @@ -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() |