Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't pin serialport to a fork. Use upgraded upstream version 4.3.0 #5726

Merged
merged 3 commits into from
Feb 1, 2024
Merged

Don't pin serialport to a fork. Use upgraded upstream version 4.3.0 #5726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c103896
Don't pin serialport to a fork. Use upgraded upstream
faern Jan 25, 2024
c91d29e
Set serial baud rate to zero on macOS
faern Jan 25, 2024
43f31c7
Stop ignoring RUSTSEC-2020-0168 in the testframework audit CI job
faern Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/cargo-audit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
83 changes: 32 additions & 51 deletions test/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
7 changes: 6 additions & 1 deletion test/test-manager/src/run_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 6 additions & 1 deletion test/test-runner/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading