diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-07-30 12:28:51 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-08-09 09:43:58 +0200 |
| commit | b44cfab6800e7f5acdb852a0397bfe845e8df9a0 (patch) | |
| tree | 848ad04d83f47c2d589f15ee5e55b6539e1d5a78 /test | |
| parent | c4ec5af818910fc18241ea5558828061b4a063a1 (diff) | |
| download | mullvadvpn-b44cfab6800e7f5acdb852a0397bfe845e8df9a0.tar.xz mullvadvpn-b44cfab6800e7f5acdb852a0397bfe845e8df9a0.zip | |
Fix nightly lints
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-manager/src/tests/tunnel_state.rs | 6 | ||||
| -rw-r--r-- | test/test-runner/src/main.rs | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test/test-manager/src/tests/tunnel_state.rs b/test/test-manager/src/tests/tunnel_state.rs index 5a94c60bc6..e8ad102419 100644 --- a/test/test-manager/src/tests/tunnel_state.rs +++ b/test/test-manager/src/tests/tunnel_state.rs @@ -440,13 +440,11 @@ pub async fn test_connecting_state_when_corrupted_state_cache( // side-effect of this is that no network traffic is allowed to leak. log::info!("Starting the app back up again"); rpc.start_mullvad_daemon().await?; - wait_for_tunnel_state(mullvad_client.clone(), |state| !state.is_disconnected()) - .await - .map_err(|err| { + wait_for_tunnel_state(mullvad_client.clone(), |state| !state.is_disconnected()).await + .inspect_err(|_| { log::error!("App did not start in an expected state. \ App is not in either `Connecting` or `Connected` state after starting with corrupt state cache! \ There is a possibility of leaks during app startup "); - err })?; log::info!("App successfully recovered from a corrupt tunnel state cache."); diff --git a/test/test-runner/src/main.rs b/test/test-runner/src/main.rs index 3fe91fb723..59fc83672d 100644 --- a/test/test-runner/src/main.rs +++ b/test/test-runner/src/main.rs @@ -422,7 +422,7 @@ impl Service for TestServer { match stderr.read_line(&mut line).await { Ok(0) => break, Ok(_) => { - let trimmed = line.trim_end_matches(&['\r', '\n']); + let trimmed = line.trim_end_matches(['\r', '\n']); log::info!("child stderr (pid={pid}): {trimmed}"); line.clear(); } |
