Skip to content

fix for flaky BackwardSyncContextTest #9856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
macfarla merged 2 commits into from
Feb 21, 2026
Merged

fix for flaky BackwardSyncContextTest #9856

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e075f7a
fix for flaky test
macfarla Feb 20, 2026
ab5e506
Merge branch 'main' into flaky-backwardsync-context-test
macfarla Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ...est/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,15 @@ public void shouldSyncUntilRemoteBranch() throws Exception {
@Test
public void shouldAddExpectedBlock() throws Exception {

final CompletableFuture<Void> future =
context.syncBackwardsUntil(getRemoteBlockByNumber(REMOTE_HEIGHT - 1));
// Append the higher block to the backward chain before starting sync,
// so both targets are available when the sync session begins.
// This avoids a race where the first sync session completes before the
// second syncBackwardsUntil call can update the target height.
final Block lowerBlock = getRemoteBlockByNumber(REMOTE_HEIGHT - 1);
final Block higherBlock = getRemoteBlockByNumber(REMOTE_HEIGHT);

final CompletableFuture<Void> secondFuture =
context.syncBackwardsUntil(getRemoteBlockByNumber(REMOTE_HEIGHT));
final CompletableFuture<Void> future = context.syncBackwardsUntil(lowerBlock);
final CompletableFuture<Void> secondFuture = context.syncBackwardsUntil(higherBlock);

assertThat(future).isSameAs(secondFuture);

Expand All @@ -362,10 +366,10 @@ public void shouldAddExpectedBlock() throws Exception {
.untilAsserted(
() -> {
respondUntilFutureIsDone(future);
assertThat(future).isCompleted();
assertThat(future).isDone();
});

secondFuture.get();
future.get();
assertThat(localBlockchain.getChainHeadBlock()).isEqualTo(remoteBlockchain.getChainHeadBlock());
}

Expand Down