Merge branch 'upgrade-serialport'

Author: faern

.github/workflows/cargo-audit.yml

@@ -33,5 +33,4 @@ jobs:
           # Ignored audit issues. This list should be kept short, and effort should be
           # put into removing items from the list.
           # RUSTSEC-2023-0057,RUSTSEC-2023-0058 - Unsoundness in `inventory`.
-          # RUSTSEC-2020-0168 - `mach` is unmaintained. Can be fixed by upgrading `serialport`.
-          ignore: RUSTSEC-2023-0057,RUSTSEC-2023-0058,RUSTSEC-2020-0168
+          ignore: RUSTSEC-2023-0057,RUSTSEC-2023-0058

test/Cargo.lock

@@ -19,9 +19,6 @@ rust_2018_idioms = "deny"
 [workspace.lints.clippy]
 unused_async = "deny"
 
-[patch.crates-io]
-serialport = { git = "https://github.com/mullvad/serialport-rs", rev = "1401c9d39e4a89685e3506a7160869b2c8e9ceb0" }
-
 [workspace.dependencies]
 futures = "0.3"
 tokio = { version = "1.8", features = ["macros", "rt", "process", "time", "fs", "io-util", "rt-multi-thread"] }

test/Cargo.toml

@@ -15,7 +15,12 @@ use std::time::Duration;
 use test_rpc::logging::Output;
 use test_rpc::{mullvad_daemon::MullvadClientVersion, ServiceClient};
 
-const BAUD: u32 = 115200;
+/// The baud rate of the serial connection between the test manager and the test runner.
+/// There is a known issue with setting a baud rate at all or macOS, and the workaround
+/// is to set it to zero: https://github.com/serialport/serialport-rs/pull/58
+///
+/// Keep this constant in sync with `test-runner/src/main.rs`
+const BAUD: u32 = if cfg!(target_os = "macos") { 0 } else { 115200 };
 
 pub async fn run(
     config: tests::config::TestConfig,

test/test-manager/src/run_tests.rs

@@ -299,7 +299,12 @@ fn get_pipe_status() -> ServiceStatus {
     }
 }
 
-const BAUD: u32 = 115200;
+/// The baud rate of the serial connection between the test manager and the test runner.
+/// There is a known issue with setting a baud rate at all or macOS, and the workaround
+/// is to set it to zero: https://github.com/serialport/serialport-rs/pull/58
+///
+/// Keep this constant in sync with `test-manager/src/run_tests.rs`
+const BAUD: u32 = if cfg!(target_os = "macos") { 0 } else { 115200 };
 
 #[derive(err_derive::Error, Debug)]
 pub enum Error {