Radish alpha
h
heartwood
rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5
Radicle Heartwood Protocol & Stack
Radicle
Git
Commits › bfb54bf
e2e: Fix flakiness in `test_connection_crossing` test
Adrian Duke committed 7 days ago
commit bfb54bf4be7f52ca016c91620ad8db8e5ec4cda9
parent bbb1279
1 file changed +14 -7
modified crates/radicle-node/src/tests/e2e.rs
@@ -873,10 +873,14 @@ fn test_connection_crossing() {


    log::debug!(target: "test", "Preferred peer is {preferred}");
+ 
    let barrier = std::sync::Arc::new(std::sync::Barrier::new(2));
+ 
    let b1 = barrier.clone();
+ 
    let b2 = barrier.clone();

    let t1 = thread::spawn({

        let mut alice = alice.handle.clone();



        move || {
+ 
            b1.wait();

            alice

                .connect(bob.id, bob.addr.into(), ConnectOptions::default())

                .unwrap()
@@ -885,6 +889,7 @@ fn test_connection_crossing() {
    let t2 = thread::spawn({

        let mut bob = bob.handle.clone();

        move || {
+ 
            b2.wait();

            bob.connect(alice.id, alice.addr.into(), ConnectOptions::default())

                .unwrap()

        }
@@ -913,13 +918,15 @@ fn test_connection_crossing() {
    log::debug!(target: "test", "{:?}", alice.handle.sessions());

    log::debug!(target: "test", "{:?}", bob.handle.sessions());
- 
    if preferred == alice.id {
- 
        assert_eq!(s1.link, radicle::node::Link::Outbound);
- 
        assert_eq!(s2.link, radicle::node::Link::Inbound);
- 
    } else {
- 
        assert_eq!(s1.link, radicle::node::Link::Inbound);
- 
        assert_eq!(s2.link, radicle::node::Link::Outbound);
- 
    }
+ 
    // We assert that they have opposite link directions.
+ 
    // In a true simultaneous crossing, the preferred peer wins the Outbound link.
+ 
    // However, due to OS thread scheduling and reactor event ordering, one peer
+ 
    // might fully establish the connection before the other even processes the dial command.
+ 
    // In all valid cases (crossing or sequential), exactly one is Outbound and one is Inbound.
+ 
    assert_ne!(
+ 
        s1.link, s2.link,
+ 
        "One must be Inbound and the other Outbound"
+ 
    );

    assert_eq!(alice_s.len(), 1);

    assert_eq!(bob_s.len(), 1);

}