Compare commits

..

1 Commits

Author SHA1 Message Date
Hocuri
617c908545 Update README.md: Use ci-chatmail instead of nine
IIRC, using nine.testrun.org for testing is bad, and ci-chatmail should be used instead?
2026-05-13 14:59:50 +02:00
2 changed files with 8 additions and 10 deletions

View File

@@ -29,7 +29,7 @@ $ pip install .
1. Build `deltachat-rpc-server` with `cargo build -p deltachat-rpc-server`.
2. Install tox `pip install -U tox`
3. Run `CHATMAIL_DOMAIN=nine.testrun.org PATH="../target/debug:$PATH" tox`.
3. Run `CHATMAIL_DOMAIN=ci-chatmail.testrun.org PATH="../target/debug:$PATH" tox`.
Additional arguments to `tox` are passed to pytest, e.g. `tox -- -s` does not capture test output.

View File

@@ -109,8 +109,8 @@ pub(crate) async fn connect_tcp_inner(
) -> Result<Pin<Box<TimeoutStream<TcpStream>>>> {
let tcp_stream = timeout(TIMEOUT, TcpStream::connect(addr))
.await
.with_context(|| format!("Connection to {addr} timed out"))?
.with_context(|| format!("Connection to {addr} failed"))?;
.context("Connection timeout")?
.context("Connection failure")?;
// Disable Nagle's algorithm.
tcp_stream.set_nodelay(true)?;
@@ -180,7 +180,7 @@ where
delay_set.spawn(tokio::time::sleep(delay));
}
let mut all_errors = Vec::new();
let mut first_error = None;
let res = loop {
if let Some(fut) = futures.next() {
@@ -200,7 +200,7 @@ where
}
Ok(Err(err)) => {
// Some connection attempt failed.
all_errors.push(err);
first_error.get_or_insert(err);
}
Err(err) => {
break Err(err);
@@ -211,11 +211,9 @@ where
// Out of connection attempts.
//
// Break out of the loop and return error.
break if all_errors.is_empty() {
Err(format_err!("No connection attempts were made"))
} else {
Err(format_err!("All connection attempts failed: {}", all_errors.into_iter().map(|err| format!("{err:#}")).collect::<Vec<String>>().join("; ")))
};
break Err(
first_error.unwrap_or_else(|| format_err!("No connection attempts were made"))
);
}
}
},