diff options
| author | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2025-09-12 16:57:53 +0200 |
|---|---|---|
| committer | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2025-09-15 11:08:30 +0200 |
| commit | e93d2fcedb5895657f3dfc672f29e98de821e357 (patch) | |
| tree | 8e7616786a3994463a88c54bd29b2be7e7636edd /test | |
| parent | 7a6714a5601003076c0a259f7f724a7240f90830 (diff) | |
| download | mullvadvpn-e93d2fcedb5895657f3dfc672f29e98de821e357.tar.xz mullvadvpn-e93d2fcedb5895657f3dfc672f29e98de821e357.zip | |
Update ipnetwork and convert LazyLock to const
Diffstat (limited to 'test')
| -rw-r--r-- | test/Cargo.lock | 4 | ||||
| -rw-r--r-- | test/test-manager/Cargo.toml | 2 | ||||
| -rw-r--r-- | test/test-manager/src/vm/network/linux.rs | 14 |
3 files changed, 11 insertions, 9 deletions
diff --git a/test/Cargo.lock b/test/Cargo.lock index 0dd07c4221..263e29b763 100644 --- a/test/Cargo.lock +++ b/test/Cargo.lock @@ -1692,9 +1692,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "ipnetwork" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +checksum = "cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763" dependencies = [ "serde", ] diff --git a/test/test-manager/Cargo.toml b/test/test-manager/Cargo.toml index 1583681b63..bc7ab9515d 100644 --- a/test/test-manager/Cargo.toml +++ b/test/test-manager/Cargo.toml @@ -21,7 +21,7 @@ tokio-serial = { workspace = true } thiserror = { workspace = true } bytes = { workspace = true } test_macro = { path = "./test_macro" } -ipnetwork = "0.20" +ipnetwork = "0.21.1" inventory = "0.3" data-encoding-macro = "0.1.12" itertools = "0.10.5" diff --git a/test/test-manager/src/vm/network/linux.rs b/test/test-manager/src/vm/network/linux.rs index 561eb91d27..b6df187dcc 100644 --- a/test/test-manager/src/vm/network/linux.rs +++ b/test/test-manager/src/vm/network/linux.rs @@ -2,11 +2,10 @@ use ipnetwork::{Ipv4Network, Ipv6Network}; use std::{ ffi::OsStr, io, - net::{IpAddr, Ipv4Addr}, + net::{IpAddr, Ipv4Addr, Ipv6Addr}, ops::RangeInclusive, process::Stdio, str::FromStr, - sync::LazyLock, }; use tokio::{ io::{AsyncBufReadExt, AsyncWriteExt, BufReader}, @@ -14,16 +13,19 @@ use tokio::{ }; /// (Contained) IPv4 subnet for the test runner: 172.29.1.1/24 -pub static TEST_SUBNET_IPV4: LazyLock<Ipv4Network> = - LazyLock::new(|| "172.29.1.1/24".parse().unwrap()); +pub const TEST_SUBNET_IPV4: Ipv4Network = + Ipv4Network::new_checked(Ipv4Addr::new(172, 29, 1, 1), 24).unwrap(); /// IPv4 range returned by the DHCP server. pub const TEST_SUBNET_IPV4_DHCP: RangeInclusive<Ipv4Addr> = Ipv4Addr::new(172, 29, 1, 2)..=Ipv4Addr::new(172, 29, 1, 128); /// IPv6 subnet for the test runner. "0xfd multest" -pub static TEST_SUBNET_IPV6: LazyLock<Ipv6Network> = - LazyLock::new(|| "fd6d:756c:7465:7374::1/64".parse().unwrap()); +pub const TEST_SUBNET_IPV6: Ipv6Network = Ipv6Network::new_checked( + Ipv6Addr::new(0xfd6d, 0x756c, 0x7465, 0x7374, 0, 0, 0, 1), + 64, +) +.unwrap(); /// Bridge interface on the host pub(crate) const BRIDGE_NAME: &str = "br-mullvadtest"; |