diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2023-12-18 12:12:17 +0100 |
|---|---|---|
| committer | Jonathan <jonathan@mullvad.net> | 2023-12-21 13:33:59 +0100 |
| commit | 72a22cf7d00dffdc99e4b2ae26a713416a2ed735 (patch) | |
| tree | 762865091fa14b605d13995127260ed6aef6cb73 /test/test-manager | |
| parent | 98b7117405d95b005e1211b4decbc71664388e7f (diff) | |
| download | mullvadvpn-72a22cf7d00dffdc99e4b2ae26a713416a2ed735.tar.xz mullvadvpn-72a22cf7d00dffdc99e4b2ae26a713416a2ed735.zip | |
Remove `GetCurrentLocation`.
Make the daemon send two tunnel state updates, one with out IP being
empty, and another with it being filled when am.i.mullvad.net responds.
Update CLI for this change. Other front ends are left out.
Diffstat (limited to 'test/test-manager')
| -rw-r--r-- | test/test-manager/src/tests/helpers.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/tests/settings.rs | 3 | ||||
| -rw-r--r-- | test/test-manager/src/tests/tunnel_state.rs | 8 |
3 files changed, 5 insertions, 8 deletions
diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs index 48dba20aac..3f64aef1be 100644 --- a/test/test-manager/src/tests/helpers.rs +++ b/test/test-manager/src/tests/helpers.rs @@ -229,7 +229,7 @@ pub async fn disconnect_and_wait( .await .map_err(|error| Error::DaemonError(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 aea81028fe..d2bde57fcc 100644 --- a/test/test-manager/src/tests/settings.rs +++ b/test/test-manager/src/tests/settings.rs @@ -107,9 +107,8 @@ 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 // mullvad_client diff --git a/test/test-manager/src/tests/tunnel_state.rs b/test/test-manager/src/tests/tunnel_state.rs index 9ae817c7ee..d8cce41b3a 100644 --- a/test/test-manager/src/tests/tunnel_state.rs +++ b/test/test-manager/src/tests/tunnel_state.rs @@ -32,9 +32,8 @@ 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 // @@ -90,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(), @@ -172,9 +171,8 @@ 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 // |