Remove explicit disconnects, log probe fail causes

mullvad · Nov 19, 2023 · 80039ac · 80039ac
1 parent 5d9a6b6
commit 80039ac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 30 deletions.
diff --git a/test/test-manager/src/tests/settings.rs b/test/test-manager/src/tests/settings.rs
@@ -55,7 +55,7 @@ pub async fn test_lan(
     .await?;
     assert!(
         detected_probes.none(),
-        "observed unexpected outgoing LAN packets"
+        "observed unexpected outgoing LAN packets: {detected_probes:?}"
     );
 
     //
@@ -79,11 +79,9 @@ pub async fn test_lan(
         send_guest_probes(rpc.clone(), Some(default_interface), lan_destination).await?;
     assert!(
         detected_probes.all(),
-        "did not observe all outgoing LAN packets"
+        "did not observe all outgoing LAN packets: {detected_probes:?}"
     );
 
-    disconnect_and_wait(&mut mullvad_client).await?;
-
     Ok(())
 }
 
@@ -146,7 +144,10 @@ pub async fn test_lockdown(
         lan_destination,
     )
     .await?;
-    assert!(detected_probes.none(), "observed outgoing packets to LAN");
+    assert!(
+        detected_probes.none(),
+        "observed outgoing packets to LAN: {detected_probes:?}"
+    );
 
     let detected_probes = send_guest_probes(
         rpc.clone(),
@@ -156,7 +157,7 @@ pub async fn test_lockdown(
     .await?;
     assert!(
         detected_probes.none(),
-        "observed outgoing packets to internet"
+        "observed outgoing packets to internet: {detected_probes:?}"
     );
 
     //
@@ -182,7 +183,7 @@ pub async fn test_lockdown(
     .await?;
     assert!(
         detected_probes.all(),
-        "did not observe some outgoing packets"
+        "did not observe some outgoing packets: {detected_probes:?}"
     );
 
     let detected_probes = send_guest_probes(
@@ -193,7 +194,7 @@ pub async fn test_lockdown(
     .await?;
     assert!(
         detected_probes.none(),
-        "observed outgoing packets to internet"
+        "observed outgoing packets to internet: {detected_probes:?}"
     );
 
     //
@@ -217,7 +218,7 @@ pub async fn test_lockdown(
         send_guest_probes(rpc.clone(), Some(default_interface), inet_destination).await?;
     assert!(
         detected_probes.none(),
-        "observed outgoing packets to internet"
+        "observed outgoing packets to internet: {detected_probes:?}"
     );
 
     //
@@ -228,7 +229,5 @@ pub async fn test_lockdown(
         .await
         .expect("failed to disable lockdown mode");
 
-    disconnect_and_wait(&mut mullvad_client).await?;
-
     Ok(())
 }
diff --git a/test/test-manager/src/tests/tunnel_state.rs b/test/test-manager/src/tests/tunnel_state.rs
@@ -163,14 +163,6 @@ pub async fn test_connecting_state(
 
     assert_tunnel_state!(&mut mullvad_client, TunnelState::Connecting { .. });
 
-    //
-    // Disconnect
-    //
-
-    log::info!("Disconnecting");
-
-    disconnect_and_wait(&mut mullvad_client).await?;
-
     Ok(())
 }
 
@@ -257,14 +249,6 @@ pub async fn test_error_state(
         "observed unexpected outgoing packets (DNS, lan)"
     );
 
-    //
-    // Disconnect
-    //
-
-    log::info!("Disconnecting");
-
-    disconnect_and_wait(&mut mullvad_client).await?;
-
     Ok(())
 }
 
@@ -358,15 +342,13 @@ pub async fn test_connected_state(
         send_guest_probes(rpc.clone(), Some(nontun_iface), inet_destination).await?;
     assert!(
         detected_probes.none(),
-        "observed unexpected outgoing packets"
+        "observed unexpected outgoing packets: {detected_probes:?}"
     );
 
     assert!(
         helpers::using_mullvad_exit(&rpc).await,
         "expected Mullvad exit IP"
     );
 
-    disconnect_and_wait(&mut mullvad_client).await?;
-
     Ok(())
 }