summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2024-07-16 12:49:53 +0200
committerLinus Färnstrand <linus@mullvad.net>2024-07-16 12:49:53 +0200
commit49ff1b46da6b79df5ed429fa23d40402069662b0 (patch)
treeae5a642ccde8d8eb8fdad82b84df63016402a962
parent5f91acaf8721002ffa6907f1a370e432eb3911aa (diff)
parent3d8fd4a71e3b5a295f756c7082674f1c90180b28 (diff)
downloadmullvadvpn-49ff1b46da6b79df5ed429fa23d40402069662b0.tar.xz
mullvadvpn-49ff1b46da6b79df5ed429fa23d40402069662b0.zip
Merge branch 'fix-dns-e2e-tests'
-rw-r--r--test/test-manager/src/tests/dns.rs18
1 files changed, 15 insertions, 3 deletions
diff --git a/test/test-manager/src/tests/dns.rs b/test/test-manager/src/tests/dns.rs
index c90dd3c5e0..d7ea3d021d 100644
--- a/test/test-manager/src/tests/dns.rs
+++ b/test/test-manager/src/tests/dns.rs
@@ -8,7 +8,10 @@ use std::{
use itertools::Itertools;
use mullvad_management_interface::MullvadProxyClient;
use mullvad_types::{
- relay_constraints::RelaySettings, settings, ConnectionConfig, CustomTunnelEndpoint,
+ relay_constraints::RelaySettings,
+ settings,
+ wireguard::{DaitaSettings, QuantumResistantState},
+ ConnectionConfig, CustomTunnelEndpoint,
};
use talpid_types::net::wireguard;
use test_macro::test_function;
@@ -630,9 +633,18 @@ async fn run_dns_config_test<
Ok(())
}
-/// Connect to the WireGuard relay that is set up in scripts/setup-network.sh
-/// See that script for details.
+/// Connect to the WireGuard relay that is set up in test-manager/src/vm/network
+/// See those files for details.
async fn connect_local_wg_relay(mullvad_client: &mut MullvadProxyClient) -> Result<(), Error> {
+ // the local wg relay doesn't support negotiating an ephemeral peer
+ // which means we can't use PQ or daita.
+ mullvad_client
+ .set_quantum_resistant_tunnel(QuantumResistantState::Off)
+ .await?;
+ mullvad_client
+ .set_daita_settings(DaitaSettings { enabled: false })
+ .await?;
+
let peer_addr: SocketAddr = SocketAddr::new(
IpAddr::V4(CUSTOM_TUN_REMOTE_REAL_ADDR),
CUSTOM_TUN_REMOTE_REAL_PORT,