fixup! Replace wireguard-go with GotaTun in test-manager

Author: hulthe

test/test-manager/src/container.rs

@@ -1,12 +1,11 @@
-#![cfg(target_os = "linux")]
-
-use nix::unistd::geteuid;
-use tokio::process::Command;
-
 /// Re-launch self with rootlesskit if we're not root.
 /// Allows for rootless and containerized networking.
 /// The VNC port is published to localhost.
+#[cfg(target_os = "linux")]
 pub async fn relaunch_with_rootlesskit(vnc_port: Option<u16>) {
+    use nix::unistd::geteuid;
+    use tokio::process::Command;
+
     // check if user is root (`man getuid`).
     if geteuid().is_root() {
         return;
@@ -44,3 +43,23 @@ pub async fn relaunch_with_rootlesskit(vnc_port: Option<u16>) {
 
     std::process::exit(status.code().unwrap_or(1));
 }
+
+#[cfg(target_os = "macos")]
+async fn relaunch_with_sudo() {
+    // check if user is root (`man getuid`).
+    if nix::unistd::geteuid().is_root() {
+        return;
+    }
+    let mut cmd = tokio::process::Command::new("sudo");
+    cmd.arg("--preserve-env");
+    cmd.args(std::env::args());
+
+    log::info!("Root privileges required. Re-launching with sudo.");
+    eprintln!("{cmd:?}");
+
+    let status = cmd.status().await.unwrap_or_else(|e| {
+        panic!("failed to execute [{cmd:?}]: {e}");
+    });
+
+    std::process::exit(status.code().unwrap_or(1));
+}

test/test-manager/src/main.rs

@@ -14,7 +14,7 @@ use std::net::IpAddr;
 use std::{net::SocketAddr, path::PathBuf, time::Duration};
 
 use anyhow::{Context, Ok, Result};
-use clap::{Parser, builder::PossibleValuesParser};
+use clap::{builder::PossibleValuesParser, Parser};
 use config::ConfigFile;
 use package::TargetInfo;
 use tests::{config::TEST_CONFIG, get_filtered_tests};
@@ -280,7 +280,7 @@ async fn inner_main() -> Result<()> {
             container::relaunch_with_rootlesskit(vnc).await;
 
             #[cfg(target_os = "macos")]
-            relaunch_with_sudo().await;
+            container::relaunch_with_sudo().await;
 
             let mut config = config.clone();
             config.runtime_opts.keep_changes = keep_changes;
@@ -316,7 +316,7 @@ async fn inner_main() -> Result<()> {
             container::relaunch_with_rootlesskit(vnc).await;
 
             #[cfg(target_os = "macos")]
-            relaunch_with_sudo().await;
+            container::relaunch_with_sudo().await;
 
             let mut config = config.clone();
             config.runtime_opts.display = match (display, vnc.is_some()) {
@@ -441,22 +441,3 @@ async fn inner_main() -> Result<()> {
         }
     }
 }
-
-async fn relaunch_with_sudo() {
-    // check if user is root (`man getuid`).
-    if nix::unistd::geteuid().is_root() {
-        return;
-    }
-    let mut cmd = tokio::process::Command::new("sudo");
-    cmd.arg("--preserve-env");
-    cmd.args(std::env::args());
-
-    log::info!("Root privileges required. Re-launching with sudo.");
-    eprintln!("{cmd:?}");
-
-    let status = cmd.status().await.unwrap_or_else(|e| {
-        panic!("failed to execute [{cmd:?}]: {e}");
-    });
-
-    std::process::exit(status.code().unwrap_or(1));
-}