diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2025-07-08 17:11:23 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2025-07-09 11:52:05 +0200 |
| commit | 126ebffd7e1f371939395c6fdbe80fd6cc8373a8 (patch) | |
| tree | 463d54be88cddba65dc261fbb77c9dd6f733b04e /test/test-manager | |
| parent | 064fb834760b641afe536e35263dfbfd3a0bd1a9 (diff) | |
| download | mullvadvpn-126ebffd7e1f371939395c6fdbe80fd6cc8373a8.tar.xz mullvadvpn-126ebffd7e1f371939395c6fdbe80fd6cc8373a8.zip | |
Inline format arguments
Diffstat (limited to 'test/test-manager')
| -rw-r--r-- | test/test-manager/src/container.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/logging.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/run_tests.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/summary.rs | 4 | ||||
| -rw-r--r-- | test/test-manager/src/tests/helpers.rs | 13 | ||||
| -rw-r--r-- | test/test-manager/src/tests/install.rs | 6 | ||||
| -rw-r--r-- | test/test-manager/src/tests/tunnel_state.rs | 5 | ||||
| -rw-r--r-- | test/test-manager/src/vm/network/linux.rs | 2 |
8 files changed, 15 insertions, 21 deletions
diff --git a/test/test-manager/src/container.rs b/test/test-manager/src/container.rs index 19cde03ee4..88ba7d9a6b 100644 --- a/test/test-manager/src/container.rs +++ b/test/test-manager/src/container.rs @@ -29,7 +29,7 @@ pub async fn relaunch_with_rootlesskit(vnc_port: Option<u16>) { cmd.args(std::env::args()); let status = cmd.status().await.unwrap_or_else(|e| { - panic!("failed to execute [{:?}]: {}", cmd, e); + panic!("failed to execute [{cmd:?}]: {e}"); }); std::process::exit(status.code().unwrap_or(1)); diff --git a/test/test-manager/src/logging.rs b/test/test-manager/src/logging.rs index 4f7d6e1e91..75b3d3f5cd 100644 --- a/test/test-manager/src/logging.rs +++ b/test/test-manager/src/logging.rs @@ -219,7 +219,7 @@ impl TestOutput { format!( "TEST {} RETURNED ERROR: {}", self.test_name, - format!("{:?}", e).bold() + format!("{e:?}").bold() ) .red() ); diff --git a/test/test-manager/src/run_tests.rs b/test/test-manager/src/run_tests.rs index 54e563f704..513a10be71 100644 --- a/test/test-manager/src/run_tests.rs +++ b/test/test-manager/src/run_tests.rs @@ -232,7 +232,7 @@ where output.append(&mut output_after_test); } Err(e) => { - output.push(Output::Other(format!("could not get logs: {:?}", e))); + output.push(Output::Other(format!("could not get logs: {e:?}"))); } } } diff --git a/test/test-manager/src/summary.rs b/test/test-manager/src/summary.rs index f0c0723c48..373235caf6 100644 --- a/test/test-manager/src/summary.rs +++ b/test/test-manager/src/summary.rs @@ -210,7 +210,7 @@ pub async fn print_summary_table<P: AsRef<Path>>(summary_files: &[P]) { let counter_text = if total_passed == total_tests { String::from(TestResult::PASS_STR) } else { - format!("({}/{})", total_passed, total_tests) + format!("({total_passed}/{total_tests})") }; println!( "<td style='text-align: center;'>{} {}</td>", @@ -266,7 +266,7 @@ pub async fn print_summary_table<P: AsRef<Path>>(summary_files: &[P]) { } TestResult::Pass | TestResult::Skip => (), } - println!("<td style='text-align: center;'>{}</td>", result); + println!("<td style='text-align: center;'>{result}</td>"); } // Print a summary of all OSes at the end of the table // For each test, collect the result for each platform. diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs index 5dcb8d0d0c..aef29578d0 100644 --- a/test/test-manager/src/tests/helpers.rs +++ b/test/test-manager/src/tests/helpers.rs @@ -488,12 +488,12 @@ pub async fn wait_for_tunnel_state( let events = rpc .events_listen() .await - .map_err(|status| Error::Daemon(format!("Failed to get event stream: {}", status)))?; + .map_err(|status| Error::Daemon(format!("Failed to get event stream: {status}")))?; let state = rpc .get_tunnel_state() .await - .map_err(|error| Error::Daemon(format!("Failed to get tunnel state: {:?}", error)))?; + .map_err(|error| Error::Daemon(format!("Failed to get tunnel state: {error:?}")))?; if accept_state_fn(&state) { return Ok(state); @@ -533,10 +533,7 @@ where None => continue, }, Some(Err(status)) => { - break Err(Error::Daemon(format!( - "Failed to get next event: {}", - status - ))); + break Err(Error::Daemon(format!("Failed to get next event: {status}"))); } None => break Err(Error::Daemon(String::from("Lost daemon event stream"))), } @@ -646,7 +643,7 @@ pub async fn set_custom_endpoint( mullvad_client .set_relay_settings(RelaySettings::CustomTunnelEndpoint(custom_endpoint)) .await - .map_err(|error| Error::Daemon(format!("Failed to set relay settings: {}", error))) + .map_err(|error| Error::Daemon(format!("Failed to set relay settings: {error}"))) } pub async fn update_relay_constraints( @@ -1322,7 +1319,7 @@ pub async fn set_location( let mut settings = mullvad_client .get_settings() .await - .map_err(|error| Error::Daemon(format!("Failed to set relay settings: {}", error)))?; + .map_err(|error| Error::Daemon(format!("Failed to set relay settings: {error}")))?; settings.bridge_settings.normal.location = Constraint::Only(location_constraint.clone()); mullvad_client diff --git a/test/test-manager/src/tests/install.rs b/test/test-manager/src/tests/install.rs index 0639694986..4c0195f3a5 100644 --- a/test/test-manager/src/tests/install.rs +++ b/test/test-manager/src/tests/install.rs @@ -230,8 +230,7 @@ pub async fn test_uninstall_app( assert!( !devices.iter().any(|device| device.id == uninstalled_device), - "device id {} still exists after uninstall", - uninstalled_device, + "device id {uninstalled_device} still exists after uninstall", ); Ok(()) @@ -280,8 +279,7 @@ pub async fn test_detect_app_removal( .expect("failed to list devices"); assert!( !devices.iter().any(|device| device.id == uninstalled_device), - "device id {} still exists after uninstall", - uninstalled_device, + "device id {uninstalled_device} still exists after uninstall", ); return Ok(()); diff --git a/test/test-manager/src/tests/tunnel_state.rs b/test/test-manager/src/tests/tunnel_state.rs index 60f266721e..9b83e65ff8 100644 --- a/test/test-manager/src/tests/tunnel_state.rs +++ b/test/test-manager/src/tests/tunnel_state.rs @@ -210,8 +210,7 @@ pub async fn test_connecting_state( assert!( matches!(new_state, TunnelState::Connecting { .. }), - "failed to enter connecting state: {:?}", - new_state + "failed to enter connecting state: {new_state:?}" ); // Leak test @@ -373,7 +372,7 @@ pub async fn test_connected_state( } => { assert_eq!(*addr.ip(), relay.ipv4_addr_in); } - actual => panic!("unexpected tunnel state: {:?}", actual), + actual => panic!("unexpected tunnel state: {actual:?}"), } // Ping outside of tunnel while connected diff --git a/test/test-manager/src/vm/network/linux.rs b/test/test-manager/src/vm/network/linux.rs index f5ed523655..ef7eebeb2a 100644 --- a/test/test-manager/src/vm/network/linux.rs +++ b/test/test-manager/src/vm/network/linux.rs @@ -204,7 +204,7 @@ async fn start_dnsmasq() -> Result<DhcpProcHandle> { "-i", BRIDGE_NAME, "-F", - &format!("{},{}", TEST_SUBNET_DHCP_FIRST, TEST_SUBNET_DHCP_LAST), + &format!("{TEST_SUBNET_DHCP_FIRST},{TEST_SUBNET_DHCP_LAST}"), "--no-hosts", "--keep-in-foreground", "--log-facility=-", |
