diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-07-10 16:06:11 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-07-10 16:06:28 +0200 |
| commit | 107b8559c5a7ed4c514e50d1df6bd2407d1d6f27 (patch) | |
| tree | 0a0925aa61f7da26d5e619ac1e9fdd3784256e5c /test/functional/feature_maxuploadtarget.py | |
| parent | a4eb6a51a7f6eb68c35a90436739e0a7d884ed94 (diff) | |
| parent | fa3365430c5fb57d7c0b5f2bce9fbbe290be93c3 (diff) | |
| download | bitcoin-107b8559c5a7ed4c514e50d1df6bd2407d1d6f27.tar.xz | |
Merge #18638: net: Use mockable time for ping/pong, add tests
fa3365430c5fb57d7c0b5f2bce9fbbe290be93c3 net: Use mockable time for ping/pong, add tests (MarcoFalke)
faab4aaf2fa1153c6d76efc8113fa01b06943ece util: Add count_microseconds helper (MarcoFalke)
Pull request description:
Switch `CNode::m_ping_start` and `CNetMessage::m_time` to mockable time, so that tests can be added.
Mockable time is also type-safe, since it uses `std::chrono`
ACKs for top commit:
jonatack:
Code review re-ACK fa33654 re-read code, verified rebase per `git range-diff 4b5c919 fa94d6f fa33654`, previous tested ACKs still valid
troygiorshev:
ACK fa3365430c5fb57d7c0b5f2bce9fbbe290be93c3
Tree-SHA512: 7d632bd6019ce7c882029e71b667a61517e783af82755a85dd979ef09380934e172dec8b8f91d57b200a30a6e096aeaf01f19fee7f3aed0e0e871c72eb44d70e
Diffstat (limited to 'test/functional/feature_maxuploadtarget.py')
| -rwxr-xr-x | test/functional/feature_maxuploadtarget.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/functional/feature_maxuploadtarget.py b/test/functional/feature_maxuploadtarget.py index 5056b807cb..5538d6d3b4 100755 --- a/test/functional/feature_maxuploadtarget.py +++ b/test/functional/feature_maxuploadtarget.py @@ -35,7 +35,11 @@ class MaxUploadTest(BitcoinTestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 - self.extra_args = [["-maxuploadtarget=800", "-acceptnonstdtxn=1"]] + self.extra_args = [[ + "-maxuploadtarget=800", + "-acceptnonstdtxn=1", + "-peertimeout=9999", # bump because mocktime might cause a disconnect otherwise + ]] self.supports_cli = False # Cache for utxos, as the listunspent may take a long time later in the test |