diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-01-04 04:25:07 +0100 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-01-18 15:30:47 +0100 |
| commit | 5006ef2b4ac646f242e1564e83f43e3d2993a6b4 (patch) | |
| tree | 12fbe1373a30d4aaf61c4f1b944ee55b47662dd3 /test/test-manager/src | |
| parent | df2c42059be814d11d2ce1cf649c09aa73f96268 (diff) | |
| download | mullvadvpn-5006ef2b4ac646f242e1564e83f43e3d2993a6b4.tar.xz mullvadvpn-5006ef2b4ac646f242e1564e83f43e3d2993a6b4.zip | |
Print if lockdown mode is enabled when disconnected for `mullvad status`
Add `locked_down` field to disconnected tunnel state.
Diffstat (limited to 'test/test-manager/src')
| -rw-r--r-- | test/test-manager/src/tests/helpers.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/tests/settings.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/tests/tunnel_state.rs | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs index 3956aa2c15..9f092f60f2 100644 --- a/test/test-manager/src/tests/helpers.rs +++ b/test/test-manager/src/tests/helpers.rs @@ -227,7 +227,7 @@ pub async fn disconnect_and_wait(mullvad_client: &mut MullvadProxyClient) -> Res .await .map_err(|error| Error::Daemon(format!("failed to begin disconnecting: {}", error)))?; wait_for_tunnel_state(mullvad_client.clone(), |state| { - matches!(state, TunnelState::Disconnected(_)) + matches!(state, TunnelState::Disconnected { .. }) }) .await?; diff --git a/test/test-manager/src/tests/settings.rs b/test/test-manager/src/tests/settings.rs index 5fdd298de1..2b488dea22 100644 --- a/test/test-manager/src/tests/settings.rs +++ b/test/test-manager/src/tests/settings.rs @@ -107,7 +107,7 @@ pub async fn test_lockdown( let inet_destination: SocketAddr = "1.1.1.1:1337".parse().unwrap(); log::info!("Verify tunnel state: disconnected"); - assert_tunnel_state!(&mut mullvad_client, TunnelState::Disconnected(_)); + assert_tunnel_state!(&mut mullvad_client, TunnelState::Disconnected { .. }); // Enable lockdown mode // diff --git a/test/test-manager/src/tests/tunnel_state.rs b/test/test-manager/src/tests/tunnel_state.rs index 5b884474ac..7abc505939 100644 --- a/test/test-manager/src/tests/tunnel_state.rs +++ b/test/test-manager/src/tests/tunnel_state.rs @@ -32,7 +32,7 @@ pub async fn test_disconnected_state( let inet_destination = "1.3.3.7:1337".parse().unwrap(); log::info!("Verify tunnel state: disconnected"); - assert_tunnel_state!(&mut mullvad_client, TunnelState::Disconnected(_)); + assert_tunnel_state!(&mut mullvad_client, TunnelState::Disconnected { .. }); // Test whether outgoing packets can be observed // @@ -89,7 +89,7 @@ pub async fn test_connecting_state( let lan_dns: SocketAddr = SocketAddr::new(IpAddr::V4(DUMMY_LAN_INTERFACE_IP), 53); log::info!("Verify tunnel state: disconnected"); - assert_tunnel_state!(&mut mullvad_client, TunnelState::Disconnected(_)); + assert_tunnel_state!(&mut mullvad_client, TunnelState::Disconnected { .. }); let relay_settings = RelaySettings::CustomTunnelEndpoint(CustomTunnelEndpoint { host: "1.3.3.7".to_owned(), @@ -171,7 +171,7 @@ pub async fn test_error_state( let lan_dns: SocketAddr = SocketAddr::new(IpAddr::V4(DUMMY_LAN_INTERFACE_IP), 53); log::info!("Verify tunnel state: disconnected"); - assert_tunnel_state!(&mut mullvad_client, TunnelState::Disconnected(_)); + assert_tunnel_state!(&mut mullvad_client, TunnelState::Disconnected { .. }); // Connect to non-existent location // |