summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-11-15 09:55:33 +0100
committerDavid Lönnhager <david.l@mullvad.net>2024-11-18 10:13:34 +0100
commitcfba89463b57f9c8c21dd6fd9df43de99afb9a91 (patch)
tree6a3c9588cba9605ee6656784ce4fad05fc7b37de /test
parent7a4477b3e59cfe427dafc23f56d72939dde1e4a3 (diff)
downloadmullvadvpn-cfba89463b57f9c8c21dd6fd9df43de99afb9a91.tar.xz
mullvadvpn-cfba89463b57f9c8c21dd6fd9df43de99afb9a91.zip
Run connection-checker against the specified API environment
Diffstat (limited to 'test')
-rw-r--r--test/connection-checker/src/cli.rs3
-rw-r--r--test/connection-checker/src/main.rs2
-rw-r--r--test/test-manager/src/tests/helpers.rs2
3 files changed, 6 insertions, 1 deletions
diff --git a/test/connection-checker/src/cli.rs b/test/connection-checker/src/cli.rs
index 97240cf974..66402c8959 100644
--- a/test/connection-checker/src/cli.rs
+++ b/test/connection-checker/src/cli.rs
@@ -37,4 +37,7 @@ pub struct Opt {
/// Junk data for each UDP and TCP packet
#[clap(long, requires = "leak", default_value = "Hello there!")]
pub payload: String,
+
+ /// URL to perform the connection check against. For example, https://am.i.mullvad.net/json.
+ pub url: String,
}
diff --git a/test/connection-checker/src/main.rs b/test/connection-checker/src/main.rs
index c56d8b31da..6fb0d84843 100644
--- a/test/connection-checker/src/main.rs
+++ b/test/connection-checker/src/main.rs
@@ -49,7 +49,7 @@ fn am_i_mullvad(opt: &Opt) -> eyre::Result<bool> {
mullvad_exit_ip_hostname: Option<String>,
}
- let url = "https://am.i.mullvad.net/json";
+ let url = &opt.url;
let client = Client::new();
let response: Response = client
diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs
index 84945aef79..fc86a73c70 100644
--- a/test/test-manager/src/tests/helpers.rs
+++ b/test/test-manager/src/tests/helpers.rs
@@ -982,6 +982,8 @@ impl ConnChecker {
"--leak-tcp",
"--leak-udp",
"--leak-icmp",
+ "--url",
+ &format!("https://am.i.{}/json", TEST_CONFIG.mullvad_host),
]
.map(String::from)
.to_vec();