test: Rename wait until helper to wait_until_helper #19816

pull MarcoFalke wants to merge 3 commits into bitcoin:master from MarcoFalke:2008-testWaithelper changing 7 files +27 −26

MarcoFalke commented at 6:52 AM on August 27, 2020: member

This avoids confusion with the wait_until member functions, which should be preferred because they take the appropriate locks and scale the timeout appropriately on their own.
fanquake added the label Tests on Aug 27, 2020
MarcoFalke force-pushed on Aug 27, 2020

in test/functional/test_framework/util.py:235 in fa40d02914 outdated

 234 | -    from `BitcoinTestFramework` or `P2PInterface` class ensures an understandable
 235 | -    amount of timeout and a common shared timeout_factor. Furthermore, `wait_until()`
 236 | +    not aware of the context of the test framework. Using the `wait_until()` members
 237 | +    from `BitcoinTestFramework` or `P2PInterface` class ensures the timeout is
 238 | +    properly scaled.  Furthermore, `wait_until()`
 239 |      from `P2PInterface` class in `mininode.py` has a preset lock.

hebasto commented at 9:32 AM on August 27, 2020:

fa40d0291427922e85e579def2b616d02a01b15b See #19760:

    from `P2PInterface` class in `p2p.py` has a preset lock.

MarcoFalke commented at 9:48 AM on August 27, 2020:

thx, fixed

hebasto changes_requested
hebasto commented at 9:33 AM on August 27, 2020: member

Approach ACK fa1850fb59e4697622fa00c640f9fc6e18ee1a8d
test: Remove unused p2p_lock in VersionBitsWarningTest facb41bf1d
MarcoFalke force-pushed on Aug 27, 2020
test: Rename wait until helper to wait_until_helper fad2794e93
test: Remove unused lock arg from BitcoinTestFramework.wait_until fa1cd9e1dd
MarcoFalke force-pushed on Aug 27, 2020
theStack commented at 10:48 AM on August 28, 2020: member

Concept ACK
laanwj commented at 11:39 AM on September 1, 2020: member

Code review ACK fa1cd9e1ddc6918c3d600d36eadea71eebb242b6
hebasto approved
hebasto commented at 1:55 PM on September 1, 2020: member

ACK fa1cd9e1ddc6918c3d600d36eadea71eebb242b6, I have reviewed the code and it looks OK, I agree it can be merged.
fanquake merged this on Sep 3, 2020
fanquake closed this on Sep 3, 2020
MarcoFalke deleted the branch on Sep 3, 2020
sidhujag referenced this in commit 1d62744a55 on Sep 3, 2020
deadalnix referenced this in commit 1c87cbc205 on Sep 22, 2021
deadalnix referenced this in commit 97af018aaa on Sep 22, 2021
DrahtBot locked this on Feb 15, 2022

Contributors

Labels