There are tests related to banning in both p2p_disconnect_ban and rpc_setban, some of them are testing same scenarios. So, this PR moves all banning test stuff to rpc_setban and leaves p2p_disconnect_ban only for disconnecting stuff. Since p2p_disconnect_ban doesn't have any banning stuff, this PR also renames that to p2p_disconnect.
test: merge banning test from p2p_disconnect_ban to rpc_setban #26863
pull brunoerg wants to merge 3 commits into bitcoin:master from brunoerg:2023-01-merge-ban-test changing 5 files +145 −186-
brunoerg commented at 1:25 PM on January 10, 2023: contributor
-
DrahtBot commented at 1:25 PM on January 10, 2023: contributor
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
Code Coverage
For detailed information about the code coverage, see the test coverage report.
<!--021abf342d371248e50ceaed478a90ca-->
Reviews
See the guideline for information on the review process. A summary of reviews will appear here.
<!--174a7506f384e20aa4161008e828411d-->
Conflicts
Reviewers, this pull request conflicts with the following ones:
- #29483 (test, ci: add --v1transport option, add --v2transport to a CI task by mzumsande)
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 added the label Tests on Jan 10, 2023
-
brunoerg commented at 1:29 PM on January 10, 2023: contributor
- brunoerg force-pushed on Jan 10, 2023
- brunoerg marked this as ready for review on Jan 10, 2023
- brunoerg force-pushed on Jan 10, 2023
- DrahtBot added the label Needs rebase on Jan 17, 2023
- brunoerg force-pushed on Jan 17, 2023
- DrahtBot removed the label Needs rebase on Jan 17, 2023
- DrahtBot added the label Needs rebase on Feb 7, 2023
- brunoerg force-pushed on Feb 7, 2023
- DrahtBot removed the label Needs rebase on Feb 7, 2023
- DrahtBot added the label Needs rebase on Feb 20, 2023
- brunoerg force-pushed on Feb 20, 2023
- DrahtBot removed the label Needs rebase on Feb 20, 2023
- achow101 requested review from maflcko on Apr 25, 2023
- DrahtBot added the label Needs rebase on Apr 27, 2023
- brunoerg force-pushed on Apr 27, 2023
-
brunoerg commented at 12:47 PM on April 27, 2023: contributor
Rebased
- DrahtBot removed the label Needs rebase on Apr 27, 2023
- DrahtBot added the label Needs rebase on May 1, 2023
- brunoerg force-pushed on May 1, 2023
-
brunoerg commented at 10:28 PM on May 1, 2023: contributor
Rebased
- DrahtBot removed the label Needs rebase on May 1, 2023
- DrahtBot added the label CI failed on May 1, 2023
-
DrahtBot commented at 10:36 AM on May 2, 2023: contributor
CI failed
- brunoerg marked this as a draft on May 2, 2023
- brunoerg force-pushed on May 2, 2023
- brunoerg force-pushed on May 2, 2023
- brunoerg marked this as ready for review on May 2, 2023
- DrahtBot removed the label CI failed on May 2, 2023
- DrahtBot added the label Needs rebase on Oct 3, 2023
- brunoerg force-pushed on Oct 3, 2023
- DrahtBot removed the label Needs rebase on Oct 3, 2023
- DrahtBot added the label CI failed on Oct 4, 2023
- DrahtBot removed the label CI failed on Oct 5, 2023
- DrahtBot added the label CI failed on Oct 25, 2023
- DrahtBot removed the label CI failed on Oct 29, 2023
- DrahtBot added the label CI failed on Jan 13, 2024
- DrahtBot added the label Needs rebase on Feb 8, 2024
-
54d0e32193
test: merge `setban` test from `p2p_disconnect_ban` to `rpc_setban`
Sometimes both ones are testing same stuff related to banning, it makes sense to merge them to avoid repetition.
-
test: remove ban test from `p2p_disconnect_ban` 370b843a75
-
rename `p2p_disconnect_ban` to `p2p_disconnect` 682ba546af
- brunoerg force-pushed on Feb 13, 2024
-
brunoerg commented at 9:46 PM on February 13, 2024: contributor
Rebased
- DrahtBot removed the label Needs rebase on Feb 13, 2024
- DrahtBot removed the label CI failed on Feb 14, 2024
-
glozow commented at 3:41 PM on February 16, 2024: member
Since there doesn't seem to be very much review interest... is there any benefit in moving these tests to a different file?
-
brunoerg commented at 3:48 PM on February 16, 2024: contributor
Since there doesn't seem to be very much review interest... is there any benefit in moving these tests to a different file?
Currently, there are stuff that are being test in both
p2p_disconnect_banandrpc_setban(e.g. "Test the ban list is preserved through restart" insetbanand "setban: test persistence across node restart" inp2p_disconnect_ban). Since we have a specific test forsetbanRPC, the idea is concentrate everything about it there. -
DrahtBot commented at 2:43 PM on March 11, 2024: contributor
<!--cf906140f33d8803c4a75a2196329ecb-->
🐙 This pull request conflicts with the target branch and needs rebase.
- DrahtBot added the label Needs rebase on Mar 11, 2024
-
brunoerg commented at 9:40 PM on March 20, 2024: contributor
I'll close for now and work in a simpler alternative.
- brunoerg closed this on Mar 20, 2024
- bitcoin locked this on Mar 20, 2025