diff options
| author | Jonathan <jonathan@mullvad.net> | 2023-12-21 13:36:52 +0100 |
|---|---|---|
| committer | Jonathan <jonathan@mullvad.net> | 2023-12-21 13:36:52 +0100 |
| commit | 9d71eccc2f3507928b833f969c952347c7a76d4c (patch) | |
| tree | c92a6f524fa9f659a0edb2bb702e466d051ddba2 /test | |
| parent | ce7f4f73f82295275631ef05dbe12ba17843ec2d (diff) | |
| parent | 8ed53a012b6c510a0dfd92925b8b0e742fd79da3 (diff) | |
| download | mullvadvpn-9d71eccc2f3507928b833f969c952347c7a76d4c.tar.xz mullvadvpn-9d71eccc2f3507928b833f969c952347c7a76d4c.zip | |
Merge branch 'out-ip-delay'
Diffstat (limited to 'test')
| -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 // |