diff options
| author | merge-script <falke.marco@gmail.com> | 2021-09-10 10:02:03 +0200 |
|---|---|---|
| committer | merge-script <falke.marco@gmail.com> | 2021-09-10 10:02:03 +0200 |
| commit | 60881158c8010e436e3c107a2d62ffb7aa23220c (patch) | |
| tree | ac7ba18e3d67c08cfda911ec4686874a78529be8 /src/attributes.h | |
| parent | b8336b22d30d628b9324d7b9e4fe12d7f9ec5bb8 (diff) | |
| parent | fa676dbac87919061de9f82bce65e373e8d85bd1 (diff) | |
| download | bitcoin-60881158c8010e436e3c107a2d62ffb7aa23220c.tar.xz | |
Merge bitcoin/bitcoin#22907: test: Avoid intermittent test failure in feature_csv_activation.py
fa676dbac87919061de9f82bce65e373e8d85bd1 test: pep-8 whitespace (MarcoFalke)
faed284eabb250a07331dfca22bb8f96a95c72ea test: Avoid intermittent test failure in feature_csv_activation.py (MarcoFalke)
Pull request description:
Otherwise there will be disconnects if the test runs longer than the default peertimeout (60s):
```
node0 2021-09-05T20:28:30.973116Z (mocktime: 2021-09-01T07:17:29Z) [net] [net.cpp:1323] [InactivityCheck] socket receive timeout: 393061s peer=0
```
Fix that by skipping `InactivityCheck` via a large `-peertimeout`.
ACKs for top commit:
fanquake:
ACK fa676dbac87919061de9f82bce65e373e8d85bd1
Tree-SHA512: 061c0585a805aa2f8e55c4beedd4b8498a2951f33d60aa3632dda0a284db3a627d14a23dbd57e8a66c69a1612f39418e3a755c8ca97f6ae1105c0d70f0d1a801
Diffstat (limited to 'src/attributes.h')
0 files changed, 0 insertions, 0 deletions