test: scripted-diff cleanups after generate* changes #23474

pull MarcoFalke wants to merge 4 commits into bitcoin:master from MarcoFalke:2107-testSync changing 178 files +179 −340

MarcoFalke commented at 9:46 AM on November 9, 2021: member

Some cleanups after commit 94db963de501e4aba6e5d8150a01ceb85753dee1
MarcoFalke cross-referenced this on Nov 9, 2021 from issue test: Implicitly sync after generate* to preempt races and intermittent test failures by MarcoFalke

in test/functional/feature_blockfilterindex_prune.py:27 in fa88b30855 outdated

  25 | @@ -26,9 +26,7 @@ def run_test(self):
  26 |          assert_greater_than(len(self.nodes[0].getblockfilter(self.nodes[0].getbestblockhash())['filter']), 0)
  27 |          # Mine two batches of blocks to avoid hitting NODE_NETWORK_LIMITED_MIN_BLOCKS disconnection

MarcoFalke commented at 9:53 AM on November 9, 2021:

This is wrong

MarcoFalke commented at 10:26 AM on November 9, 2021:

Ok, actually it doesn't matter: #23365 (review)

DrahtBot added the label Tests on Nov 9, 2021
in test/functional/feature_backwards_compatibility.py:69 in fa6c996486 outdated
```
  65 | @@ -66,8 +66,6 @@ def setup_nodes(self):
  66 |      def run_test(self):
  67 |          self.generatetoaddress(self.nodes[0], COINBASE_MATURITY + 1, self.nodes[0].getnewaddress())
  68 |  
  69 | -        self.sync_blocks()
```
benthecarman commented at 11:22 PM on November 9, 2021:

commit fa6c9964860cd154cf40aff74dfa038aa6006de0 says to remove sync_all but you are removing sync_blocks as well

MarcoFalke commented at 9:14 AM on November 10, 2021:

Thanks, adjusted the commit subject
DrahtBot commented at 3:07 AM on November 10, 2021: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #23365 (index: Fix backwards search for bestblock by mzumsande)
- #23127 (tests: Use test framework utils where possible by vincenzopalazzo)
- #23075 (refactoring: Fee estimation functional test cleanups by darosior)
- #22364 (wallet: Make a tr() descriptor by default by achow101)
- #21726 (Improve Indices on pruned nodes via prune blockers by fjahr)
- #21283 (Implement BIP 370 PSBTv2 by achow101)
- #10102 (Multiprocess bitcoin by ryanofsky)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
DrahtBot cross-referenced this on Nov 10, 2021 from issue index: Fix backwards search for bestblock by mzumsande
fanquake commented at 7:47 AM on November 10, 2021: member

Concept ACK
DrahtBot cross-referenced this on Nov 10, 2021 from issue tests: Use test framework utils where possible by vincenzopalazzo
test: Use 4 spaces for indentation faeff57709
MarcoFalke force-pushed on Nov 10, 2021
test: Properly set sync_fun in NodeNetworkLimitedTest fad13991ae

scripted-diff: Remove redundant sync_all and sync_blocks

The sync calls are redundant after a call to generate, because generate
already syncs itself.

-BEGIN VERIFY SCRIPT-
perl -0777 -pi -e 's/(generate[^\n]*\)[^\n]*)(\n|\s)+self.sync_(all|blocks)\([^\)]*\)\n/\1\n/g' $(git grep -l generate ./test)
-END VERIFY SCRIPT-

fa974f1f14

scripted-diff: Bump copyright headers

The previous diff touched most files in ./test/, so bump the headers to
avoid having to touch them again for a bump later.

-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./test/
-END VERIFY SCRIPT-

fac23c2114

MarcoFalke force-pushed on Nov 10, 2021
DrahtBot cross-referenced this on Nov 10, 2021 from issue wallet: Make a tr() descriptor by default by achow101
theStack commented at 4:30 PM on November 10, 2021: contributor

Concept ACK
DrahtBot cross-referenced this on Nov 10, 2021 from issue Improve Indices on pruned nodes via prune blockers by fjahr
DrahtBot cross-referenced this on Nov 10, 2021 from issue Implement BIP 370 PSBTv2 by achow101
DrahtBot cross-referenced this on Nov 10, 2021 from issue multiprocess: Add bitcoin-gui -ipcconnect option by ryanofsky
DrahtBot cross-referenced this on Nov 10, 2021 from issue multiprocess: Add bitcoin-wallet -ipcconnect option by ryanofsky
DrahtBot cross-referenced this on Nov 11, 2021 from issue Multiprocess bitcoin by ryanofsky
DrahtBot cross-referenced this on Nov 15, 2021 from issue test: Fee estimation functional test cleanups by darosior
fanquake approved
fanquake commented at 3:21 AM on November 16, 2021: member

ACK fac23c211407a77af82bb1491c48c8d37022c8b3
fanquake merged this on Nov 16, 2021
fanquake closed this on Nov 16, 2021
MarcoFalke deleted the branch on Nov 16, 2021
sidhujag referenced this in commit 808366cc23 on Nov 16, 2021
bitcoin locked this on Nov 17, 2022

Contributors

Labels

Linked (view graph)

#22567 test: Implicitly sync after generate* to preempt races and intermittent test failures #23365 index: Fix backwards search for bestblock

test: scripted-diff cleanups after generate* changes #23474

Conflicts