diff options
39 files changed, 96 insertions, 92 deletions
diff --git a/test/connection-checker/src/main.rs b/test/connection-checker/src/main.rs index 6fb0d84843..3c8a3c1c0c 100644 --- a/test/connection-checker/src/main.rs +++ b/test/connection-checker/src/main.rs @@ -1,5 +1,5 @@ use clap::Parser; -use eyre::{eyre, Context}; +use eyre::{Context, eyre}; use reqwest::blocking::Client; use serde::Deserialize; use std::{io::stdin, time::Duration}; diff --git a/test/connection-checker/src/net.rs b/test/connection-checker/src/net.rs index 0ac19f3ca5..8b8136846f 100644 --- a/test/connection-checker/src/net.rs +++ b/test/connection-checker/src/net.rs @@ -1,4 +1,4 @@ -use eyre::{eyre, Context}; +use eyre::{Context, eyre}; use std::{ io::Write, net::{IpAddr, Ipv4Addr, SocketAddr}, diff --git a/test/test-manager/src/config/manifest.rs b/test/test-manager/src/config/manifest.rs index fdf24a8d5a..6fed25fa02 100644 --- a/test/test-manager/src/config/manifest.rs +++ b/test/test-manager/src/config/manifest.rs @@ -83,11 +83,13 @@ mod tests { }"#; let config: Config = serde_json::from_str(config).unwrap(); - assert!(config - .test_locations - .lookup("test_daita") - .unwrap() - .contains(&"se-got-wg-002".to_string())); + assert!( + config + .test_locations + .lookup("test_daita") + .unwrap() + .contains(&"se-got-wg-002".to_string()) + ); assert!(!config.test_locations.0.is_empty()); } diff --git a/test/test-manager/src/config/manifest/test_locations.rs b/test/test-manager/src/config/manifest/test_locations.rs index febf9ed460..d4c25f8bae 100644 --- a/test/test-manager/src/config/manifest/test_locations.rs +++ b/test/test-manager/src/config/manifest/test_locations.rs @@ -1,7 +1,7 @@ use serde::{ + Deserialize as DeserDerive, Serialize as SerDerive, de::{Deserialize, Deserializer, Error, MapAccess, Visitor}, ser::{Serialize, SerializeMap}, - Deserialize as DeserDerive, Serialize as SerDerive, }; use std::fmt; diff --git a/test/test-manager/src/main.rs b/test/test-manager/src/main.rs index c64d8d4165..d1b9b1fcb4 100644 --- a/test/test-manager/src/main.rs +++ b/test/test-manager/src/main.rs @@ -14,7 +14,7 @@ use std::net::IpAddr; use std::{net::SocketAddr, path::PathBuf}; use anyhow::{Context, Ok, Result}; -use clap::{builder::PossibleValuesParser, Parser}; +use clap::{Parser, builder::PossibleValuesParser}; use config::ConfigFile; use package::TargetInfo; use tests::{config::TEST_CONFIG, get_filtered_tests}; diff --git a/test/test-manager/src/mullvad_daemon.rs b/test/test-manager/src/mullvad_daemon.rs index f035c244bf..e59b82f089 100644 --- a/test/test-manager/src/mullvad_daemon.rs +++ b/test/test-manager/src/mullvad_daemon.rs @@ -1,7 +1,7 @@ #![allow(clippy::disallowed_types)] use std::{io, time::Duration}; -use futures::{channel::mpsc, future::BoxFuture, pin_mut, FutureExt, SinkExt, StreamExt}; +use futures::{FutureExt, SinkExt, StreamExt, channel::mpsc, future::BoxFuture, pin_mut}; use hyper_util::rt::TokioIo; use mullvad_management_interface::{ManagementServiceClient, MullvadProxyClient}; use test_rpc::transport::{ConnectionHandle, GrpcForwarder}; diff --git a/test/test-manager/src/network_monitor.rs b/test/test-manager/src/network_monitor.rs index 28bcce23c1..e89c33fb34 100644 --- a/test/test-manager/src/network_monitor.rs +++ b/test/test-manager/src/network_monitor.rs @@ -4,12 +4,12 @@ use std::{ time::Duration, }; -use futures::{channel::oneshot, pin_mut, StreamExt}; +use futures::{StreamExt, channel::oneshot, pin_mut}; pub use pcap::Direction; use pcap::PacketCodec; use pnet_packet::{ - ethernet::EtherTypes, ip::IpNextHeaderProtocol, ipv4::Ipv4Packet, ipv6::Ipv6Packet, - tcp::TcpPacket, udp::UdpPacket, Packet, + Packet, ethernet::EtherTypes, ip::IpNextHeaderProtocol, ipv4::Ipv4Packet, ipv6::Ipv6Packet, + tcp::TcpPacket, udp::UdpPacket, }; pub use pnet_packet::ip::IpNextHeaderProtocols as IpHeaderProtocols; diff --git a/test/test-manager/src/package.rs b/test/test-manager/src/package.rs index d95a5b117d..5c8337b9c0 100644 --- a/test/test-manager/src/package.rs +++ b/test/test-manager/src/package.rs @@ -1,5 +1,5 @@ use crate::config::{Architecture, OsType, PackageType, VmConfig}; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use itertools::Itertools; use regex::Regex; use std::{ diff --git a/test/test-manager/src/run_tests.rs b/test/test-manager/src/run_tests.rs index 513a10be71..27be4ec90c 100644 --- a/test/test-manager/src/run_tests.rs +++ b/test/test-manager/src/run_tests.rs @@ -2,14 +2,14 @@ use crate::{ logging::{Logger, Panic, TestOutput, TestResult}, mullvad_daemon::{self, RpcClientProvider}, summary::SummaryLogger, - tests::{self, config::TEST_CONFIG, TestContext, TestMetadata}, + tests::{self, TestContext, TestMetadata, config::TEST_CONFIG}, vm, }; use anyhow::{Context, Result}; use futures::FutureExt; use mullvad_management_interface::MullvadProxyClient; use std::{future::Future, panic, time::Duration}; -use test_rpc::{logging::Output, ServiceClient}; +use test_rpc::{ServiceClient, logging::Output}; /// 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 diff --git a/test/test-manager/src/tests/access_methods.rs b/test/test-manager/src/tests/access_methods.rs index bead7767f2..d7acbed9a7 100644 --- a/test/test-manager/src/tests/access_methods.rs +++ b/test/test-manager/src/tests/access_methods.rs @@ -7,7 +7,7 @@ //! These tests rely on working proxies to exist *somewhere* for all tested protocols. //! If the proxies themselves are bad/not running, this test will fail due to issues //! that are out of the test manager's control. -use anyhow::{anyhow, ensure, Context}; +use anyhow::{Context, anyhow, ensure}; use mullvad_management_interface::MullvadProxyClient; use talpid_types::net::proxy::CustomProxy; diff --git a/test/test-manager/src/tests/account.rs b/test/test-manager/src/tests/account.rs index 29227cc82b..2fea7f7a93 100644 --- a/test/test-manager/src/tests/account.rs +++ b/test/test-manager/src/tests/account.rs @@ -1,9 +1,9 @@ -use crate::tests::helpers::{login_with_retries, THROTTLE_RETRY_DELAY}; +use crate::tests::helpers::{THROTTLE_RETRY_DELAY, login_with_retries}; -use super::{config::TEST_CONFIG, helpers, ui, Error, TestContext}; +use super::{Error, TestContext, config::TEST_CONFIG, helpers, ui}; use anyhow::Context; use mullvad_api::DevicesProxy; -use mullvad_management_interface::{client::DaemonEvent, MullvadProxyClient}; +use mullvad_management_interface::{MullvadProxyClient, client::DaemonEvent}; use mullvad_types::{ device::{Device, DeviceState}, states::TunnelState, @@ -278,7 +278,7 @@ pub async fn clear_devices(device_client: &DevicesProxy) -> anyhow::Result<()> { } pub async fn new_device_client() -> anyhow::Result<DevicesProxy> { - use mullvad_api::{proxy::ApiConnectionMode, ApiEndpoint}; + use mullvad_api::{ApiEndpoint, proxy::ApiConnectionMode}; let api_host = format!("api.{}", TEST_CONFIG.mullvad_host); diff --git a/test/test-manager/src/tests/audits/cve_2019_14899.rs b/test/test-manager/src/tests/audits/cve_2019_14899.rs index d723b84dd1..49fbf04d1a 100644 --- a/test/test-manager/src/tests/audits/cve_2019_14899.rs +++ b/test/test-manager/src/tests/audits/cve_2019_14899.rs @@ -21,8 +21,8 @@ use std::{ time::Duration, }; -use anyhow::{anyhow, bail, Context}; -use futures::{select, FutureExt}; +use anyhow::{Context, anyhow, bail}; +use futures::{FutureExt, select}; use mullvad_management_interface::MullvadProxyClient; use nix::{ errno::Errno, @@ -30,11 +30,11 @@ use nix::{ }; use pnet_base::MacAddr; use pnet_packet::{ + MutablePacket, Packet, ethernet::{EtherTypes, EthernetPacket, MutableEthernetPacket}, ip::IpNextHeaderProtocols, ipv4::{Ipv4Packet, MutableIpv4Packet}, tcp::{MutableTcpPacket, TcpFlags, TcpPacket}, - MutablePacket, Packet, }; use socket2::Socket; use test_macro::test_function; @@ -42,7 +42,7 @@ use test_rpc::ServiceClient; use tokio::{task::yield_now, time::sleep}; use crate::{ - tests::{config::TEST_CONFIG, helpers, TestContext}, + tests::{TestContext, config::TEST_CONFIG, helpers}, vm::network::linux::TAP_NAME, }; diff --git a/test/test-manager/src/tests/audits/mllvd_cr_24_03.rs b/test/test-manager/src/tests/audits/mllvd_cr_24_03.rs index d82945d809..524785ee3d 100644 --- a/test/test-manager/src/tests/audits/mllvd_cr_24_03.rs +++ b/test/test-manager/src/tests/audits/mllvd_cr_24_03.rs @@ -29,7 +29,7 @@ use mullvad_management_interface::MullvadProxyClient; use test_macro::test_function; use test_rpc::ServiceClient; -use crate::tests::{config::TEST_CONFIG, helpers::*, TestContext}; +use crate::tests::{TestContext, config::TEST_CONFIG, helpers::*}; #[test_function(target_os = "linux")] pub async fn test_mllvd_cr_24_03( diff --git a/test/test-manager/src/tests/audits/mul_02_002.rs b/test/test-manager/src/tests/audits/mul_02_002.rs index a03afd91b9..f125d4c222 100644 --- a/test/test-manager/src/tests/audits/mul_02_002.rs +++ b/test/test-manager/src/tests/audits/mul_02_002.rs @@ -21,11 +21,11 @@ use mullvad_types::states::TunnelState; use test_macro::test_function; use test_rpc::ServiceClient; -use crate::network_monitor::{start_packet_monitor, MonitorOptions, ParsedPacket}; +use crate::network_monitor::{MonitorOptions, ParsedPacket, start_packet_monitor}; +use crate::tests::TestContext; use crate::tests::helpers::{ - connect_and_wait, constrain_to_relay, disconnect_and_wait, ConnChecker, + ConnChecker, connect_and_wait, constrain_to_relay, disconnect_and_wait, }; -use crate::tests::TestContext; #[test_function] pub async fn test_mul_02_002( diff --git a/test/test-manager/src/tests/daita.rs b/test/test-manager/src/tests/daita.rs index fb699fde7f..a3de0a93fa 100644 --- a/test/test-manager/src/tests/daita.rs +++ b/test/test-manager/src/tests/daita.rs @@ -1,6 +1,6 @@ -use anyhow::{anyhow, bail, ensure, Context}; +use anyhow::{Context, anyhow, bail, ensure}; use futures::StreamExt; -use mullvad_management_interface::{client::DaemonEvent, MullvadProxyClient}; +use mullvad_management_interface::{MullvadProxyClient, client::DaemonEvent}; use mullvad_relay_selector::query::builder::RelayQueryBuilder; use mullvad_types::{ constraints::Constraint, relay_constraints::GeographicLocationConstraint, @@ -10,7 +10,7 @@ use talpid_types::{net::TunnelEndpoint, tunnel::ErrorStateCause}; use test_macro::test_function; use test_rpc::ServiceClient; -use super::{helpers, Error, TestContext}; +use super::{Error, TestContext, helpers}; /// Test that daita and daita_direct_only works by connecting /// - to a non-DAITA relay with singlehop (should block) @@ -181,8 +181,9 @@ pub async fn test_daita( } async fn wait_for_daemon_reconnect( - mut event_stream: impl futures::Stream<Item = Result<DaemonEvent, mullvad_management_interface::Error>> - + Unpin, + mut event_stream: impl futures::Stream< + Item = Result<DaemonEvent, mullvad_management_interface::Error>, + > + Unpin, ) -> Result<TunnelState, Error> { // wait until the daemon informs us that it's trying to connect helpers::find_daemon_event(&mut event_stream, |event| match event { diff --git a/test/test-manager/src/tests/dns.rs b/test/test-manager/src/tests/dns.rs index b54be0e02e..ff99cb4260 100644 --- a/test/test-manager/src/tests/dns.rs +++ b/test/test-manager/src/tests/dns.rs @@ -1,4 +1,4 @@ -use anyhow::{anyhow, Context}; +use anyhow::{Context, anyhow}; use std::{ net::{IpAddr, Ipv4Addr, SocketAddr}, sync::atomic::{AtomicUsize, Ordering}, @@ -8,28 +8,27 @@ use std::{ use itertools::Itertools; use mullvad_management_interface::MullvadProxyClient; use mullvad_types::{ - settings, + ConnectionConfig, CustomTunnelEndpoint, settings, wireguard::{DaitaSettings, QuantumResistantState}, - ConnectionConfig, CustomTunnelEndpoint, }; use talpid_types::net::wireguard; use test_macro::test_function; use test_rpc::ServiceClient; use super::{ - helpers::{self, connect_and_wait, set_custom_endpoint}, Error, TestContext, + helpers::{self, connect_and_wait, set_custom_endpoint}, }; use crate::{ + TEST_CONFIG, network_monitor::{ - start_packet_monitor_until, start_tunnel_packet_monitor_until, Direction, - IpHeaderProtocols, MonitorOptions, + Direction, IpHeaderProtocols, MonitorOptions, start_packet_monitor_until, + start_tunnel_packet_monitor_until, }, vm::network::{ CUSTOM_TUN_GATEWAY, CUSTOM_TUN_LOCAL_PRIVKEY, CUSTOM_TUN_LOCAL_TUN_ADDR, CUSTOM_TUN_REMOTE_PUBKEY, CUSTOM_TUN_REMOTE_REAL_PORT, CUSTOM_TUN_REMOTE_TUN_ADDR, }, - TEST_CONFIG, }; /// How long to wait for expected "DNS queries" to appear diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs index aef29578d0..16fe4e1e13 100644 --- a/test/test-manager/src/tests/helpers.rs +++ b/test/test-manager/src/tests/helpers.rs @@ -1,20 +1,20 @@ -use super::{config::TEST_CONFIG, Error, TestContext, WAIT_FOR_TUNNEL_STATE_TIMEOUT}; +use super::{Error, TestContext, WAIT_FOR_TUNNEL_STATE_TIMEOUT, config::TEST_CONFIG}; use crate::{ mullvad_daemon::RpcClientProvider, network_monitor::{ - self, start_packet_monitor, MonitorOptions, MonitorUnexpectedlyStopped, PacketMonitor, + self, MonitorOptions, MonitorUnexpectedlyStopped, PacketMonitor, start_packet_monitor, }, tests::{ account::{clear_devices, new_device_client}, helpers, }, }; -use anyhow::{anyhow, bail, ensure, Context}; +use anyhow::{Context, anyhow, bail, ensure}; use futures::StreamExt; -use mullvad_management_interface::{client::DaemonEvent, MullvadProxyClient}; +use mullvad_management_interface::{MullvadProxyClient, client::DaemonEvent}; use mullvad_relay_selector::{ - query::{OpenVpnRelayQuery, RelayQuery, WireguardRelayQuery}, GetRelay, RelaySelector, SelectorConfig, WireguardConfig, + query::{OpenVpnRelayQuery, RelayQuery, WireguardRelayQuery}, }; use mullvad_types::{ constraints::Constraint, @@ -35,7 +35,7 @@ use std::{ }; use talpid_types::net::wireguard::{PeerConfig, PrivateKey, TunnelConfig}; use test_rpc::{ - meta::Os, mullvad_daemon::ServiceStatus, package::Package, AmIMullvad, ServiceClient, SpawnOpts, + AmIMullvad, ServiceClient, SpawnOpts, meta::Os, mullvad_daemon::ServiceStatus, package::Package, }; use tokio::time::sleep; @@ -504,7 +504,7 @@ pub async fn wait_for_tunnel_state( pub async fn find_next_tunnel_state( stream: impl futures::Stream<Item = Result<DaemonEvent, mullvad_management_interface::Error>> - + Unpin, + + Unpin, accept_state_fn: impl Fn(&mullvad_types::states::TunnelState) -> bool, ) -> Result<mullvad_types::states::TunnelState, Error> { tokio::time::timeout( @@ -519,8 +519,9 @@ pub async fn find_next_tunnel_state( } pub async fn find_daemon_event<Accept, AcceptedEvent>( - mut event_stream: impl futures::Stream<Item = Result<DaemonEvent, mullvad_management_interface::Error>> - + Unpin, + mut event_stream: impl futures::Stream< + Item = Result<DaemonEvent, mullvad_management_interface::Error>, + > + Unpin, accept_event: Accept, ) -> Result<AcceptedEvent, Error> where diff --git a/test/test-manager/src/tests/install.rs b/test/test-manager/src/tests/install.rs index 4c0195f3a5..a789a87f81 100644 --- a/test/test-manager/src/tests/install.rs +++ b/test/test-manager/src/tests/install.rs @@ -1,20 +1,20 @@ -use anyhow::{bail, ensure, Context}; +use anyhow::{Context, bail, ensure}; use std::str::FromStr; use std::time::Duration; use mullvad_management_interface::MullvadProxyClient; use mullvad_types::{constraints::Constraint, relay_constraints}; use test_macro::test_function; -use test_rpc::{mullvad_daemon::ServiceStatus, ServiceClient}; +use test_rpc::{ServiceClient, mullvad_daemon::ServiceStatus}; use crate::tests::helpers; use super::{ + Error, TestContext, config::TEST_CONFIG, helpers::{ - connect_and_wait, get_app_env, get_package_desc, install_app, wait_for_tunnel_state, Pinger, + Pinger, connect_and_wait, get_app_env, get_package_desc, install_app, wait_for_tunnel_state, }, - Error, TestContext, }; /// Upgrade to the "version under test". This test fails if: diff --git a/test/test-manager/src/tests/macos.rs b/test/test-manager/src/tests/macos.rs index 362a9b3c61..140f77bb10 100644 --- a/test/test-manager/src/tests/macos.rs +++ b/test/test-manager/src/tests/macos.rs @@ -1,6 +1,6 @@ //! macOS-specific tests. -use anyhow::{bail, ensure, Context}; +use anyhow::{Context, bail, ensure}; use mullvad_management_interface::MullvadProxyClient; use std::net::{Ipv4Addr, SocketAddr}; use test_macro::test_function; diff --git a/test/test-manager/src/tests/mod.rs b/test/test-manager/src/tests/mod.rs index fcf02ac0f6..39f4f12e90 100644 --- a/test/test-manager/src/tests/mod.rs +++ b/test/test-manager/src/tests/mod.rs @@ -29,7 +29,7 @@ use config::TEST_CONFIG; use helpers::{find_custom_list, get_app_env, install_app, set_location}; pub use install::test_upgrade_app; use mullvad_management_interface::MullvadProxyClient; -use test_rpc::{meta::Os, ServiceClient}; +use test_rpc::{ServiceClient, meta::Os}; const WAIT_FOR_TUNNEL_STATE_TIMEOUT: Duration = Duration::from_secs(40); diff --git a/test/test-manager/src/tests/relay_ip_overrides.rs b/test/test-manager/src/tests/relay_ip_overrides.rs index a38be6f905..b3d29a5bd3 100644 --- a/test/test-manager/src/tests/relay_ip_overrides.rs +++ b/test/test-manager/src/tests/relay_ip_overrides.rs @@ -1,14 +1,14 @@ #![cfg(target_os = "linux")] use super::{ - helpers::{self, AbortOnDrop}, TestContext, + helpers::{self, AbortOnDrop}, }; use crate::{ tests::config::TEST_CONFIG, vm::{self, network::linux::TEST_SUBNET}, }; -use anyhow::{anyhow, bail, ensure, Context}; +use anyhow::{Context, anyhow, bail, ensure}; use futures::FutureExt; use mullvad_management_interface::MullvadProxyClient; use mullvad_relay_selector::query::builder::RelayQueryBuilder; diff --git a/test/test-manager/src/tests/settings.rs b/test/test-manager/src/tests/settings.rs index bd52800499..bc7ad3287d 100644 --- a/test/test-manager/src/tests/settings.rs +++ b/test/test-manager/src/tests/settings.rs @@ -1,7 +1,6 @@ use super::{ - helpers, + Error, TestContext, helpers, helpers::{connect_and_wait, send_guest_probes}, - Error, TestContext, }; use mullvad_management_interface::MullvadProxyClient; diff --git a/test/test-manager/src/tests/software.rs b/test/test-manager/src/tests/software.rs index 45b1c73ae1..e3619555aa 100644 --- a/test/test-manager/src/tests/software.rs +++ b/test/test-manager/src/tests/software.rs @@ -1,6 +1,6 @@ //! Tests of interoperability with other software -use super::{helpers, Error, TestContext}; +use super::{Error, TestContext, helpers}; use mullvad_management_interface::MullvadProxyClient; use test_macro::test_function; use test_rpc::{ExecResult, ServiceClient}; diff --git a/test/test-manager/src/tests/split_tunnel.rs b/test/test-manager/src/tests/split_tunnel.rs index 98cbed7951..74d43c9d8c 100644 --- a/test/test-manager/src/tests/split_tunnel.rs +++ b/test/test-manager/src/tests/split_tunnel.rs @@ -2,11 +2,12 @@ use anyhow::Context; use mullvad_management_interface::MullvadProxyClient; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use test_macro::test_function; -use test_rpc::{meta::OsVersion, ServiceClient}; +use test_rpc::{ServiceClient, meta::OsVersion}; use super::{ + TestContext, helpers::{self, ConnChecker}, - ui, TestContext, + ui, }; const LEAK_DESTINATION: SocketAddr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(1, 1, 1, 1)), 1337); diff --git a/test/test-manager/src/tests/tunnel.rs b/test/test-manager/src/tests/tunnel.rs index 9f9b16b7b6..ecae2604c3 100644 --- a/test/test-manager/src/tests/tunnel.rs +++ b/test/test-manager/src/tests/tunnel.rs @@ -1,10 +1,10 @@ use super::{ + Error, TestContext, config::TEST_CONFIG, helpers::{self, apply_settings_from_relay_query, connect_and_wait, disconnect_and_wait}, - Error, TestContext, }; use crate::{ - network_monitor::{start_packet_monitor, MonitorOptions}, + network_monitor::{MonitorOptions, start_packet_monitor}, tests::helpers::{login_with_retries, update_relay_constraints}, }; @@ -20,11 +20,11 @@ use mullvad_types::{ }; use std::net::SocketAddr; use talpid_types::net::{ - proxy::{CustomProxy, Socks5Local, Socks5Remote}, TransportProtocol, TunnelType, + proxy::{CustomProxy, Socks5Local, Socks5Remote}, }; use test_macro::test_function; -use test_rpc::{meta::Os, mullvad_daemon::ServiceStatus, ServiceClient}; +use test_rpc::{ServiceClient, meta::Os, mullvad_daemon::ServiceStatus}; use pnet_packet::ip::IpNextHeaderProtocols; diff --git a/test/test-manager/src/tests/tunnel_state.rs b/test/test-manager/src/tests/tunnel_state.rs index 9b83e65ff8..4a02ede39d 100644 --- a/test/test-manager/src/tests/tunnel_state.rs +++ b/test/test-manager/src/tests/tunnel_state.rs @@ -1,9 +1,10 @@ use super::{ + Error, TestContext, helpers::{ self, connect_and_wait, send_guest_probes, unreachable_wireguard_tunnel, wait_for_tunnel_state, }, - ui, Error, TestContext, + ui, }; use crate::{ assert_tunnel_state, @@ -13,10 +14,10 @@ use crate::{ use mullvad_management_interface::MullvadProxyClient; use mullvad_relay_selector::query::builder::RelayQueryBuilder; use mullvad_types::{ + CustomTunnelEndpoint, constraints::Constraint, relay_constraints::{GeographicLocationConstraint, LocationConstraint}, states::TunnelState, - CustomTunnelEndpoint, }; use std::{net::SocketAddr, time::Duration}; use talpid_types::net::{Endpoint, TransportProtocol, TunnelEndpoint, TunnelType}; diff --git a/test/test-manager/src/tests/ui.rs b/test/test-manager/src/tests/ui.rs index 889eabd850..1260bfeadc 100644 --- a/test/test-manager/src/tests/ui.rs +++ b/test/test-manager/src/tests/ui.rs @@ -1,4 +1,4 @@ -use super::{config::TEST_CONFIG, helpers, Error, TestContext}; +use super::{Error, TestContext, config::TEST_CONFIG, helpers}; use mullvad_management_interface::MullvadProxyClient; use mullvad_relay_selector::query::builder::RelayQueryBuilder; use mullvad_types::relay_constraints::RelaySettings; @@ -8,7 +8,7 @@ use std::{ path::{Path, PathBuf}, }; use test_macro::test_function; -use test_rpc::{meta::Os, ExecResult, ServiceClient}; +use test_rpc::{ExecResult, ServiceClient, meta::Os}; pub async fn run_test<T: AsRef<str> + Debug>( rpc: &ServiceClient, diff --git a/test/test-manager/src/vm/network/macos.rs b/test/test-manager/src/vm/network/macos.rs index 792f7d9a77..4803d2aaa5 100644 --- a/test/test-manager/src/vm/network/macos.rs +++ b/test/test-manager/src/vm/network/macos.rs @@ -1,4 +1,4 @@ -use anyhow::{anyhow, Context, Result}; +use anyhow::{Context, Result, anyhow}; use futures::future::{self, Either}; use nix::sys::socket::SockaddrStorage; use std::net::{Ipv4Addr, SocketAddrV4}; diff --git a/test/test-manager/src/vm/provision.rs b/test/test-manager/src/vm/provision.rs index 1ca962cbfb..ef1347ba62 100644 --- a/test/test-manager/src/vm/provision.rs +++ b/test/test-manager/src/vm/provision.rs @@ -3,7 +3,7 @@ use crate::{ package, tests::config::BOOTSTRAP_SCRIPT, }; -use anyhow::{bail, Context, Result}; +use anyhow::{Context, Result, bail}; use ssh2::{File, Session}; use std::{ io::{self, Read}, diff --git a/test/test-manager/src/vm/qemu.rs b/test/test-manager/src/vm/qemu.rs index 9028bb94d9..18ee843c4d 100644 --- a/test/test-manager/src/vm/qemu.rs +++ b/test/test-manager/src/vm/qemu.rs @@ -18,7 +18,7 @@ use tokio::{ }; use uuid::Uuid; -use super::{network, VmInstance}; +use super::{VmInstance, network}; const LOG_PREFIX: &str = "[qemu] "; const STDERR_LOG_LEVEL: log::Level = log::Level::Error; diff --git a/test/test-manager/src/vm/tart.rs b/test/test-manager/src/vm/tart.rs index faf6853d90..ca004b1201 100644 --- a/test/test-manager/src/vm/tart.rs +++ b/test/test-manager/src/vm/tart.rs @@ -1,11 +1,11 @@ use crate::config::{self, Config, VmConfig}; -use anyhow::{anyhow, Context, Result}; +use anyhow::{Context, Result, anyhow}; use regex::Regex; use std::{net::IpAddr, process::Stdio, time::Duration}; use tokio::process::{Child, Command}; use uuid::Uuid; -use super::{logging::forward_logs, util::find_pty, VmInstance}; +use super::{VmInstance, logging::forward_logs, util::find_pty}; const LOG_PREFIX: &str = "[tart] "; const STDERR_LOG_LEVEL: log::Level = log::Level::Error; diff --git a/test/test-manager/test_macro/src/lib.rs b/test/test-manager/test_macro/src/lib.rs index 5f5af2c4da..ee560384e2 100644 --- a/test/test-manager/test_macro/src/lib.rs +++ b/test/test-manager/test_macro/src/lib.rs @@ -1,5 +1,5 @@ use proc_macro::TokenStream; -use quote::{quote, ToTokens}; +use quote::{ToTokens, quote}; use syn::{AttributeArgs, Lit, Meta, NestedMeta, Result}; use test_rpc::meta::Os; diff --git a/test/test-rpc/src/net.rs b/test/test-rpc/src/net.rs index 4ef3b7cd1e..27a93d1a10 100644 --- a/test/test-rpc/src/net.rs +++ b/test/test-rpc/src/net.rs @@ -4,7 +4,7 @@ use futures::channel::oneshot; use http_body_util::{BodyExt, Full}; use hyper::Uri; use hyper_util::client::legacy::Client; -use serde::{de::DeserializeOwned, Deserialize, Serialize}; +use serde::{Deserialize, Serialize, de::DeserializeOwned}; use std::{ net::SocketAddr, sync::{Arc, LazyLock}, diff --git a/test/test-rpc/src/transport.rs b/test/test-rpc/src/transport.rs index ffdefbf923..eee35a5c44 100644 --- a/test/test-rpc/src/transport.rs +++ b/test/test-rpc/src/transport.rs @@ -1,12 +1,12 @@ use bytes::{Buf, BufMut, Bytes, BytesMut}; -use futures::{channel::mpsc, FutureExt, SinkExt, StreamExt}; -use serde::{de::DeserializeOwned, Serialize}; +use futures::{FutureExt, SinkExt, StreamExt, channel::mpsc}; +use serde::{Serialize, de::DeserializeOwned}; use std::{ fmt::Write, io, sync::{ - atomic::{AtomicBool, Ordering}, Arc, + atomic::{AtomicBool, Ordering}, }, time::Duration, }; diff --git a/test/test-runner/src/forward.rs b/test/test-runner/src/forward.rs index 01b48e647a..590e164940 100644 --- a/test/test-runner/src/forward.rs +++ b/test/test-runner/src/forward.rs @@ -2,8 +2,8 @@ use std::{ collections::HashMap, net::SocketAddr, sync::{ - atomic::{AtomicUsize, Ordering}, Arc, LazyLock, Mutex, + atomic::{AtomicUsize, Ordering}, }, }; use test_rpc::net::SockHandleId; diff --git a/test/test-runner/src/logging.rs b/test/test-runner/src/logging.rs index bab3693c34..55e6668604 100644 --- a/test/test-runner/src/logging.rs +++ b/test/test-runner/src/logging.rs @@ -9,8 +9,8 @@ use tokio::{ fs::File, io::{self, AsyncBufReadExt, BufReader}, sync::{ - broadcast::{channel, Receiver, Sender}, Mutex, + broadcast::{Receiver, Sender, channel}, }, }; diff --git a/test/test-runner/src/main.rs b/test/test-runner/src/main.rs index a7e1a26515..95392dc93f 100644 --- a/test/test-runner/src/main.rs +++ b/test/test-runner/src/main.rs @@ -1,4 +1,4 @@ -use futures::{pin_mut, select, select_biased, FutureExt, SinkExt, StreamExt}; +use futures::{FutureExt, SinkExt, StreamExt, pin_mut, select, select_biased}; use logging::LOGGER; use std::{ collections::{BTreeMap, HashMap}, @@ -12,17 +12,17 @@ use util::OnDrop; use tarpc::{context, server::Channel}; use test_rpc::{ + AppTrace, Service, SpawnOpts, UNPRIVILEGED_USER, meta::OsVersion, - mullvad_daemon::{ServiceStatus, SOCKET_PATH}, + mullvad_daemon::{SOCKET_PATH, ServiceStatus}, net::SockHandleId, package::Package, transport::GrpcForwarder, - AppTrace, Service, SpawnOpts, UNPRIVILEGED_USER, }; use tokio::{ io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader}, process::{ChildStdin, ChildStdout, Command}, - sync::{broadcast::error::TryRecvError, oneshot, Mutex}, + sync::{Mutex, broadcast::error::TryRecvError, oneshot}, task, time::sleep, }; diff --git a/test/test-runner/src/net.rs b/test/test-runner/src/net.rs index 7d32f04812..967d3c8c32 100644 --- a/test/test-runner/src/net.rs +++ b/test/test-runner/src/net.rs @@ -141,7 +141,7 @@ pub async fn send_ping( interface: Option<&str>, size: usize, ) -> Result<(), test_rpc::Error> { - use surge_ping::{Client, Config, PingIdentifier, PingSequence, ICMP}; + use surge_ping::{Client, Config, ICMP, PingIdentifier, PingSequence}; const IPV4_HEADER_SIZE: usize = 20; const ICMP_HEADER_SIZE: usize = 8; diff --git a/test/test-runner/src/sys.rs b/test/test-runner/src/sys.rs index 024e1153c9..a20a84cbaa 100644 --- a/test/test-runner/src/sys.rs +++ b/test/test-runner/src/sys.rs @@ -24,7 +24,7 @@ const MULLVAD_WIN_REGISTRY: &str = r"SYSTEM\CurrentControlSet\Services\Mullvad V pub fn reboot() -> Result<(), test_rpc::Error> { use windows_sys::Win32::{ System::Shutdown::{ - ExitWindowsEx, EWX_REBOOT, SHTDN_REASON_FLAG_PLANNED, SHTDN_REASON_MAJOR_APPLICATION, + EWX_REBOOT, ExitWindowsEx, SHTDN_REASON_FLAG_PLANNED, SHTDN_REASON_MAJOR_APPLICATION, SHTDN_REASON_MINOR_OTHER, }, UI::WindowsAndMessaging::EWX_FORCEIFHUNG, @@ -65,7 +65,7 @@ fn grant_shutdown_privilege() -> Result<(), test_rpc::Error> { use windows_sys::Win32::{ Foundation::{CloseHandle, HANDLE, LUID}, Security::{ - AdjustTokenPrivileges, LookupPrivilegeValueW, LUID_AND_ATTRIBUTES, + AdjustTokenPrivileges, LUID_AND_ATTRIBUTES, LookupPrivilegeValueW, SE_PRIVILEGE_ENABLED, TOKEN_ADJUST_PRIVILEGES, TOKEN_PRIVILEGES, }, System::{ @@ -501,7 +501,7 @@ pub async fn set_daemon_environment(env: HashMap<String, String>) -> Result<(), .map_err(|e| test_rpc::Error::Registry(e.to_string()))?; } // Persist the changed environment variables, such that we can retrieve them at will. - use winreg::{enums::*, RegKey}; + use winreg::{RegKey, enums::*}; let hklm = RegKey::predef(HKEY_LOCAL_MACHINE); let path = Path::new(MULLVAD_WIN_REGISTRY).join("Environment"); let (registry, _) = hklm.create_subkey(&path).map_err(|error| { @@ -636,7 +636,7 @@ fn parse_systemd_env_file(input: &str) -> impl Iterator<Item = EnvVar> + '_ { #[cfg(target_os = "windows")] pub async fn get_daemon_environment() -> Result<HashMap<String, String>, test_rpc::Error> { - use winreg::{enums::*, RegKey}; + use winreg::{RegKey, enums::*}; let env = tokio::task::spawn_blocking(|| -> Result<HashMap<String, String>, test_rpc::Error> { |