test(e2e): queue downloads on a silent peer, not a user who does not exist

Two daemon tests cancel a download that has to still be waiting, and both
waited on e2e_ghost_peer, a user who never logs in. That only ever worked
inside a timer: the download sat unconnected until the 20-second broker
timeout failed it, and the tests cancelled inside that window. Since
CantConnectToPeer ends the wait on downloads for a peer the server cannot
reach, soulfind answers the brokered dial straight away and the download
fails before the cancel lands. The CLI test failed on every daemon-mode run,
which is what blocked the v19.0.0 release; the protocol suite's twin only
passed because its cancel raced the server's answer and won.

Both now download from a silent peer: a raw login whose announced listener
accepts the connection and never replies, so the download stays queued the
way it does behind a busy peer, for as long as the test needs it.
This commit is contained in:
Michel de Graaf
2026-09-10 13:30:50 +02:00
parent 35f50981ab
commit e39427ada5
3 changed files with 70 additions and 8 deletions
+54 -1
View File
@@ -3,8 +3,10 @@
#![allow(dead_code)]
use soulseek_rs::message::server::MessageFactory;
use soulseek_rs::{Client, ClientSettings, PeerAddress};
use std::net::TcpStream;
use std::io::{Read, Write};
use std::net::{TcpListener, TcpStream};
use std::path::{Path, PathBuf};
use std::process::{Child, Command, Stdio};
use std::time::{Duration, Instant};
@@ -145,6 +147,57 @@ pub fn login(host: &str, port: u16, user: &str, shares: Vec<String>) -> Client {
client
}
/// A user who is online and reachable but never answers, held for as long as
/// the value lives.
///
/// Their listener accepts a connection and then says nothing, so a download
/// from them waits in the queue the way one waits behind a busy peer, with no
/// timer to race. A user who does not exist cannot stand in for this: the
/// server refuses to broker a connection to them, and their download fails
/// before a test gets to act on it.
pub struct SilentPeer {
_session: TcpStream,
_listener: TcpListener,
}
pub fn silent_peer(host: &str, port: u16, user: &str) -> SilentPeer {
// Not loopback: soulfind hands a loopback login's address out as the
// host's LAN address, where a 127.0.0.1 listener is never reached.
let listener = TcpListener::bind("0.0.0.0:0").expect("silent listener");
let wait_port = listener.local_addr().expect("listener address").port();
let mut session = TcpStream::connect((host, port)).expect("server");
let login = MessageFactory::build_login_message(
user,
"pw",
soulseek_rs::ClientVersion::default(),
);
session
.write_all(&login.get_buffer())
.expect("silent login");
// soulfind drops everything but a login until the login has landed, so a
// port announced any sooner is announced to nobody.
session
.set_read_timeout(Some(Duration::from_secs(10)))
.expect("read timeout");
loop {
let mut len = [0; 4];
session.read_exact(&mut len).expect("login reply");
let mut body = vec![0; u32::from_le_bytes(len) as usize];
session.read_exact(&mut body).expect("login reply");
if body[..4] == 1u32.to_le_bytes() {
assert_eq!(body[4], 1, "{user} should log in");
break;
}
}
let wait = MessageFactory::build_set_wait_port_message(wait_port);
session.write_all(&wait.get_buffer()).expect("wait port");
settle();
SilentPeer {
_session: session,
_listener: listener,
}
}
/// Wait out the SetWaitPort registrations so peer lookups resolve.
pub fn settle() {
std::thread::sleep(Duration::from_secs(1));