Skip to content

Commit 6b9e21e

Browse files
authored
Merge branch 'stack/update-fallback' into stack/subscription-routing
2 parents 1105173 + d2a6fd6 commit 6b9e21e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

apps/freenet-ping/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/core/tests/operations.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,9 @@ async fn test_put_merge_persists_state(ctx: &mut TestContext) -> TestResult {
595595
// but the PUT caching refactor (commits 2cd337b5-0d432347) changed the subscription semantics.
596596
// Re-enabled after recent fixes to subscription logic - previously exhibited race conditions.
597597
// If this test becomes flaky again, see issue #1798 for historical context.
598+
// Ignored again due to recurring flakiness - fails intermittently with timeout waiting for
599+
// cross-node subscription notifications (Client 3 timeout). See issue #1798.
600+
#[ignore]
598601
#[freenet_test(
599602
nodes = ["gateway", "node-a", "node-b"],
600603
auto_connect_peers = true,

0 commit comments

Comments
 (0)