Skip to content

Commit a9edec9

Browse files
committed
Merge bitcoin/bitcoin#31701: test: Bump sync_mempools timeout in p2p_1p1c_network.py
fa80a7d test: Bump sync_mempools timeout in p2p_1p1c_network.py (MarcoFalke) 1111b0a ci: Add missing --combinedlogslen to test-each-commit task (MarcoFalke) Pull request description: This should address the two issues that happened in https://github.com/bitcoin/bitcoin/actions/runs/12885576442/job/35924329657?pr=25832#step:6:7601: * The combined log isn't printed on a test failure. * The timeout is too strict for the GHA virtual machines. For reference, the output was: ``` ... 149/315 - rpc_blockchain.py --v2transport passed, Duration: 10 s 150/315 - p2p_addrfetch.py passed, Duration: 1 s 151/315 - p2p_1p1c_network.py failed, Duration: 31 s stdout: 2025-01-21T12:05:49.465000Z TestFramework (INFO): PRNG seed is: 6581340712385622842 2025-01-21T12:05:49.466000Z TestFramework (INFO): Initializing test directory /tmp/test_runner_₿_🏃_20250121_120233/p2p_1p1c_network_207 2025-01-21T12:05:52.408000Z TestFramework (INFO): Fill mempools with large transactions to raise mempool minimum feerates 2025-01-21T12:05:52.408000Z TestFramework (INFO): Fill the mempool until eviction is triggered and the mempoolminfee rises 2025-01-21T12:05:59.692000Z TestFramework (INFO): Pre-send some transactions to nodes 2025-01-21T12:06:00.203000Z TestFramework (INFO): Submit full packages to node0 2025-01-21T12:06:00.220000Z TestFramework (INFO): Wait for mempools to sync 2025-01-21T12:06:20.384000Z TestFramework (ERROR): Assertion failed Traceback (most recent call last): File "/home/runner/work/bitcoin/bitcoin/test/functional/test_framework/test_framework.py", line 135, in main self.run_test() File "/home/runner/work/bitcoin/bitcoin/build/test/functional/p2p_1p1c_network.py", line 153, in run_test self.sync_mempools(timeout=20) File "/home/runner/work/bitcoin/bitcoin/test/functional/test_framework/test_framework.py", line 803, in sync_mempools raise AssertionError("Mempool sync timed out after {}s:{}".format( AssertionError: Mempool sync timed out after 20s: ... ACKs for top commit: l0rinc: utACK fa80a7d glozow: ACK fa80a7d Tree-SHA512: b326b7906b184fb47abc50d0d7ec91a6c90d324997f2abc40f156f588090e8d89bd8486bb8950cac604e77b1b336142a47b53ad463b2670d81222814eeb313d4
2 parents d7f56cc + fa80a7d commit a9edec9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023 The Bitcoin Core developers
1+
# Copyright (c) 2023-present The Bitcoin Core developers
22
# Distributed under the MIT software license, see the accompanying
33
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

@@ -72,7 +72,7 @@ jobs:
7272
run: |
7373
# Run tests on commits after the last merge commit and before the PR head commit
7474
# Use clang++, because it is a bit faster and uses less memory than g++
75-
git rebase --exec "echo Running test-one-commit on \$( git log -1 ) && CC=clang CXX=clang++ cmake -B build -DWERROR=ON -DWITH_ZMQ=ON -DBUILD_GUI=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWITH_BDB=ON -DWITH_USDT=ON -DCMAKE_CXX_FLAGS='-Wno-error=unused-member-function' && cmake --build build -j $(nproc) && ctest --output-on-failure --stop-on-failure --test-dir build -j $(nproc) && ./build/test/functional/test_runner.py -j $(( $(nproc) * 2 ))" ${{ env.TEST_BASE }}
75+
git rebase --exec "echo Running test-one-commit on \$( git log -1 ) && CC=clang CXX=clang++ cmake -B build -DWERROR=ON -DWITH_ZMQ=ON -DBUILD_GUI=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWITH_BDB=ON -DWITH_USDT=ON -DCMAKE_CXX_FLAGS='-Wno-error=unused-member-function' && cmake --build build -j $(nproc) && ctest --output-on-failure --stop-on-failure --test-dir build -j $(nproc) && ./build/test/functional/test_runner.py -j $(( $(nproc) * 2 )) --combinedlogslen=99999999" ${{ env.TEST_BASE }}
7676
7777
macos-native-arm64:
7878
name: ${{ matrix.job-name }}

test/functional/p2p_1p1c_network.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def run_test(self):
150150
assert_equal(submitpackage_result["package_msg"], "success")
151151

152152
self.log.info("Wait for mempools to sync")
153-
self.sync_mempools(timeout=20)
153+
self.sync_mempools()
154154

155155

156156
if __name__ == '__main__':

0 commit comments

Comments
 (0)