summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2023-10-25 13:02:13 +0200
committerDavid Lönnhager <david.l@mullvad.net>2023-10-31 00:45:17 +0100
commite02d812d55064fc114d38edbdcbbeda5aca6a6b7 (patch)
tree6d96b45d7b617161525497dd637a572e89bdfac7 /test
parent9b33f4440fd35d01eea663df5de7d83f65d96918 (diff)
downloadmullvadvpn-e02d812d55064fc114d38edbdcbbeda5aca6a6b7.tar.xz
mullvadvpn-e02d812d55064fc114d38edbdcbbeda5aca6a6b7.zip
Replace UpdateRelaySettings with SetRelaySettings
Diffstat (limited to 'test')
-rw-r--r--test/test-manager/src/tests/dns.rs4
-rw-r--r--test/test-manager/src/tests/helpers.rs6
-rw-r--r--test/test-manager/src/tests/tunnel.rs20
-rw-r--r--test/test-manager/src/tests/tunnel_state.rs12
-rw-r--r--test/test-manager/src/tests/ui.rs2
5 files changed, 22 insertions, 22 deletions
diff --git a/test/test-manager/src/tests/dns.rs b/test/test-manager/src/tests/dns.rs
index 69de367b88..cd30df2c88 100644
--- a/test/test-manager/src/tests/dns.rs
+++ b/test/test-manager/src/tests/dns.rs
@@ -24,7 +24,7 @@ use crate::vm::network::{
CUSTOM_TUN_REMOTE_TUN_ADDR, NON_TUN_GATEWAY,
};
-use super::helpers::update_relay_settings;
+use super::helpers::set_relay_settings;
/// How long to wait for expected "DNS queries" to appear
const MONITOR_TIMEOUT: Duration = Duration::from_secs(5);
@@ -652,7 +652,7 @@ async fn connect_local_wg_relay(mullvad_client: &mut ManagementServiceClient) ->
}),
});
- update_relay_settings(mullvad_client, relay_settings)
+ set_relay_settings(mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs
index c51f6875da..9ad3df3cdb 100644
--- a/test/test-manager/src/tests/helpers.rs
+++ b/test/test-manager/src/tests/helpers.rs
@@ -346,7 +346,7 @@ pub async fn reset_relay_settings(
let bridge_state = BridgeState::Auto;
let obfuscation_settings = ObfuscationSettings::default();
- update_relay_settings(mullvad_client, relay_settings)
+ set_relay_settings(mullvad_client, relay_settings)
.await
.map_err(|error| {
Error::DaemonError(format!("Failed to reset relay settings: {}", error))
@@ -365,14 +365,14 @@ pub async fn reset_relay_settings(
Ok(())
}
-pub async fn update_relay_settings(
+pub async fn set_relay_settings(
mullvad_client: &mut ManagementServiceClient,
relay_settings_update: RelaySettingsUpdate,
) -> Result<(), Error> {
let update = types::RelaySettingsUpdate::from(relay_settings_update);
mullvad_client
- .update_relay_settings(update)
+ .set_relay_settings(update)
.await
.map_err(|error| Error::DaemonError(format!("Failed to set relay settings: {}", error)))?;
Ok(())
diff --git a/test/test-manager/src/tests/tunnel.rs b/test/test-manager/src/tests/tunnel.rs
index 99e30b087c..79a6ab3575 100644
--- a/test/test-manager/src/tests/tunnel.rs
+++ b/test/test-manager/src/tests/tunnel.rs
@@ -1,4 +1,4 @@
-use super::helpers::{self, connect_and_wait, disconnect_and_wait, update_relay_settings};
+use super::helpers::{self, connect_and_wait, disconnect_and_wait, set_relay_settings};
use super::{Error, TestContext};
use std::net::IpAddr;
@@ -54,7 +54,7 @@ pub async fn test_openvpn_tunnel(
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -97,7 +97,7 @@ pub async fn test_wireguard_tunnel(
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -148,7 +148,7 @@ pub async fn test_udp2tcp_tunnel(
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -246,7 +246,7 @@ pub async fn test_bridge(
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -325,7 +325,7 @@ pub async fn test_multihop(
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -386,7 +386,7 @@ pub async fn test_wireguard_autoconnect(
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -428,7 +428,7 @@ pub async fn test_openvpn_autoconnect(
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -485,7 +485,7 @@ pub async fn test_quantum_resistant_tunnel(
tunnel_protocol: Some(Constraint::Only(TunnelType::Wireguard)),
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("Failed to update relay settings");
@@ -564,7 +564,7 @@ pub async fn test_quantum_resistant_multihop_udp2tcp_tunnel(
.expect("Failed to enable obfuscation");
mullvad_client
- .update_relay_settings(types::RelaySettingsUpdate::from(
+ .set_relay_settings(types::RelaySettingsUpdate::from(
RelaySettingsUpdate::Normal(RelayConstraintsUpdate {
wireguard_constraints: WireguardConstraints {
use_multihop: true,
diff --git a/test/test-manager/src/tests/tunnel_state.rs b/test/test-manager/src/tests/tunnel_state.rs
index 55b1d2074e..4cd0f54f1d 100644
--- a/test/test-manager/src/tests/tunnel_state.rs
+++ b/test/test-manager/src/tests/tunnel_state.rs
@@ -1,6 +1,6 @@
use super::helpers::{
self, connect_and_wait, disconnect_and_wait, get_tunnel_state, send_guest_probes,
- unreachable_wireguard_tunnel, update_relay_settings, wait_for_tunnel_state,
+ unreachable_wireguard_tunnel, set_relay_settings, wait_for_tunnel_state,
};
use super::{ui, Error, TestContext};
use crate::assert_tunnel_state;
@@ -93,7 +93,7 @@ pub async fn test_connecting_state(
config: mullvad_types::ConnectionConfig::Wireguard(unreachable_wireguard_tunnel()),
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -159,7 +159,7 @@ pub async fn test_connecting_state(
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -200,7 +200,7 @@ pub async fn test_error_state(
.await
.expect("failed to disable LAN sharing");
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -249,7 +249,7 @@ pub async fn test_error_state(
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
@@ -291,7 +291,7 @@ pub async fn test_connected_state(
..Default::default()
});
- update_relay_settings(&mut mullvad_client, relay_settings)
+ set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");
diff --git a/test/test-manager/src/tests/ui.rs b/test/test-manager/src/tests/ui.rs
index 1e97430061..b0308fb9f7 100644
--- a/test/test-manager/src/tests/ui.rs
+++ b/test/test-manager/src/tests/ui.rs
@@ -100,7 +100,7 @@ pub async fn test_ui_tunnel_settings(
..Default::default()
});
- helpers::update_relay_settings(&mut mullvad_client, relay_settings)
+ helpers::set_relay_settings(&mut mullvad_client, relay_settings)
.await
.expect("failed to update relay settings");