fix(deltachat-rpc-server): always run with at least two threads

We already run all async tests with
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
as we had problems in the past when running them with one thread.

This is a similar change for deltachat-rpc-server
that hopefully prevents timeouts of deltachat-rpc-client tests
on CI.

CHANGELOG.md

@@ -3033,3 +3033,4 @@ https://github.com/deltachat/deltachat-core-rust/pulls?q=is%3Apr+is%3Aclosed
 [1.126.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.125.0...v1.126.0
 [1.126.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.126.0...v1.126.1
 [1.127.0]: https://github.com/deltachat/deltachat-core-rust/compare/v1.126.1...v1.127.0
+[1.127.1]: https://github.com/deltachat/deltachat-core-rust/compare/v1.127.0...v1.127.1

deltachat-rpc-client/pyproject.toml

@@ -71,6 +71,3 @@ line-length = 120
 
 [tool.isort]
 profile = "black"
-
-[tool.pytest.ini_options]
-log_cli = true

deltachat-rpc-client/tests/test_something.py

@@ -377,3 +377,15 @@ def test_provider_info(rpc) -> None:
     rpc.set_config(account_id, "socks5_enabled", "1")
     provider_info = rpc.get_provider_info(account_id, "github.com")
     assert provider_info is None
+
+
+def test_qr_setup_contact(acfactory) -> None:
+    alice, bob = acfactory.get_online_accounts(2)
+
+    qr_code, _svg = alice.get_qr_code()
+    bob.secure_join(qr_code)
+
+    while True:
+        event = alice.wait_for_event()
+        if event["kind"] == "SecurejoinInviterProgress" and event["progress"] == 1000:
+            return

deltachat-rpc-client/tox.ini

@@ -29,3 +29,5 @@ commands =
 
 [pytest]
 timeout = 60
+log_cli = true
+log_level = info

deltachat-rpc-server/Cargo.toml

@@ -17,6 +17,7 @@ anyhow = "1"
 env_logger = { version = "0.10.0" }
 futures-lite = "2.0.0"
 log = "0.4"
+num_cpus = "1"
 serde_json = "1.0.105"
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.33.0", features = ["io-std"] }

deltachat-rpc-server/src/main.rs

@@ -20,9 +20,18 @@ use tokio::task::JoinHandle;
 use tokio_util::sync::CancellationToken;
 use yerpc::{RpcClient, RpcSession};
 
-#[tokio::main(flavor = "multi_thread")]
-async fn main() {
-    let r = main_impl().await;
+fn main() {
+    // Build multithreaded runtime with at least two threads.
+    // This ensures that on systems with one CPU
+    // such as CI runners there are at least two threads
+    // and it is more difficult to deadlock.
+    let r = tokio::runtime::Builder::new_multi_thread()
+        .worker_threads(std::cmp::max(2, num_cpus::get()))
+        .enable_all()
+        .build()
+        .unwrap()
+        .block_on(main_impl());
+
     // From tokio documentation:
     // "For technical reasons, stdin is implemented by using an ordinary blocking read on a separate
     // thread, and it is impossible to cancel that read. This can make shutdown of the runtime hang