summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSebastian Holmin <sebastian.holmin@mullvad.net>2024-11-20 13:37:18 +0100
committerSebastian Holmin <sebastian.holmin@mullvad.net>2024-11-20 13:37:18 +0100
commit0f0c2710032831e764403010dd58c200e79b2025 (patch)
tree56e5d5c6e8195a5739d127112357f7a316e27344
parent81a1b1f2ebeca336b810f1169ed2d9c1af66ee95 (diff)
parent9384795997c30e310073e6d8d8260ab5aefb5dbe (diff)
downloadmullvadvpn-0f0c2710032831e764403010dd58c200e79b2025.tar.xz
mullvadvpn-0f0c2710032831e764403010dd58c200e79b2025.zip
Merge branch 'default-to-nordic-custom-list-in-test-framework-des-1445'
-rw-r--r--test/test-manager/src/tests/tunnel.rs15
1 files changed, 4 insertions, 11 deletions
diff --git a/test/test-manager/src/tests/tunnel.rs b/test/test-manager/src/tests/tunnel.rs
index d1b6e65585..162de63f61 100644
--- a/test/test-manager/src/tests/tunnel.rs
+++ b/test/test-manager/src/tests/tunnel.rs
@@ -18,7 +18,7 @@ use mullvad_types::{
constraints::Constraint,
relay_constraints::{
self, BridgeConstraints, BridgeSettings, BridgeType, OpenVpnConstraints, RelayConstraints,
- RelaySettings, TransportPort, WireguardConstraints,
+ RelaySettings, TransportPort,
},
wireguard,
};
@@ -103,18 +103,11 @@ pub async fn test_wireguard_tunnel(
for (port, should_succeed) in PORTS {
log::info!("Connect to WireGuard endpoint on port {port}");
- let relay_settings = RelaySettings::Normal(RelayConstraints {
- tunnel_protocol: Constraint::Only(TunnelType::Wireguard),
- wireguard_constraints: WireguardConstraints {
- port: Constraint::Only(port),
- ..Default::default()
- },
- ..Default::default()
- });
+ let query = RelayQueryBuilder::new().wireguard().port(port).build();
- set_relay_settings(&mut mullvad_client, relay_settings)
+ apply_settings_from_relay_query(&mut mullvad_client, query)
.await
- .expect("failed to update relay settings");
+ .unwrap();
let connection_result = connect_and_wait(&mut mullvad_client).await;
assert_eq!(