Make e2e tests accept anyhow errors

5 files changed, 18 insertions, 20 deletions

diff --git a/test/test-manager/src/logging.rs b/test/test-manager/src/logging.rs
index cd0bd4af28..e85920b1cd 100644
--- a/test/test-manager/src/logging.rs
+++ b/test/test-manager/src/logging.rs
@@ -1,4 +1,4 @@
-use crate::tests::Error;
+use anyhow::Error;
 use colored::Colorize;
 use std::sync::{Arc, Mutex};
 use test_rpc::logging::{LogOutput, Output};
diff --git a/test/test-manager/src/run_tests.rs b/test/test-manager/src/run_tests.rs
index 6af1536562..6b3da37138 100644
--- a/test/test-manager/src/run_tests.rs
+++ b/test/test-manager/src/run_tests.rs
@@ -2,9 +2,7 @@ use crate::summary::{self, maybe_log_test_result};
 use crate::tests::{config::TEST_CONFIG, TestContext};
 use crate::{
     logging::{panic_as_string, TestOutput},
-    mullvad_daemon, tests,
-    tests::Error,
-    vm,
+    mullvad_daemon, tests, vm,
 };
 use anyhow::{Context, Result};
 use futures::FutureExt;
@@ -187,7 +185,7 @@ pub async fn run_test<F, R, MullvadClient>(
 ) -> TestOutput
 where
     F: Fn(super::tests::TestContext, ServiceClient, MullvadClient) -> R,
-    R: Future<Output = Result<(), Error>>,
+    R: Future<Output = anyhow::Result<()>>,
 {
     let _flushed = runner_rpc.try_poll_output().await;
 
diff --git a/test/test-manager/src/tests/mod.rs b/test/test-manager/src/tests/mod.rs
index f14d5238d5..48d75b9e3f 100644
--- a/test/test-manager/src/tests/mod.rs
+++ b/test/test-manager/src/tests/mod.rs
@@ -33,7 +33,7 @@ pub type TestWrapperFunction = fn(
     TestContext,
     ServiceClient,
     Box<dyn std::any::Any + Send>,
-) -> BoxFuture<'static, Result<(), Error>>;
+) -> BoxFuture<'static, anyhow::Result<()>>;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
diff --git a/test/test-manager/src/tests/split_tunnel.rs b/test/test-manager/src/tests/split_tunnel.rs
index 26ccd7794f..4cd48cdce3 100644
--- a/test/test-manager/src/tests/split_tunnel.rs
+++ b/test/test-manager/src/tests/split_tunnel.rs
@@ -3,7 +3,7 @@ use std::str;
 use test_macro::test_function;
 use test_rpc::{ExecResult, ServiceClient};
 
-use super::{helpers, Error, TestContext};
+use super::{helpers, TestContext};
 
 #[test_function]
 #[cfg(any(target_os = "linux", target_os = "windows"))]
@@ -11,30 +11,30 @@ pub async fn test_split_tunnel(
     _: TestContext,
     rpc: ServiceClient,
     mut mullvad_client: MullvadProxyClient,
-) -> Result<(), Error> {
+) -> anyhow::Result<()> {
     let mut errored = false;
-    let parse_am_i_mullvad = |result: ExecResult| -> bool {
+    let parse_am_i_mullvad = |result: ExecResult| {
         let stdout = str::from_utf8(&result.stdout).expect("am-i-mullvad output is UTF-8");
 
-        if stdout.contains("You are connected") {
+        Ok(if stdout.contains("You are connected") {
             true
         } else if stdout.contains("You are not connected") {
             false
         } else {
-            panic!("Unexpected output from `am-i-mullvad`: {stdout}")
-        }
+            anyhow::bail!("Unexpected output from `am-i-mullvad`: {stdout}")
+        })
     };
 
     helpers::connect_and_wait(&mut mullvad_client).await?;
 
-    let i_am_mullvad = parse_am_i_mullvad(rpc.exec("am-i-mullvad", []).await?);
+    let i_am_mullvad = parse_am_i_mullvad(rpc.exec("am-i-mullvad", []).await?)?;
     if !i_am_mullvad {
         log::error!("We should be connected, but `am-i-mullvad` reported that it was not connected to Mullvad.");
         errored = true;
     }
 
     let i_am_mullvad_while_split =
-        parse_am_i_mullvad(rpc.exec("mullvad-exclude", ["am-i-mullvad"]).await?);
+        parse_am_i_mullvad(rpc.exec("mullvad-exclude", ["am-i-mullvad"]).await?)?;
     if i_am_mullvad_while_split {
         log::error!("`mullvad-exclude am-i-mullvad` reported that it was connected to Mullvad.");
         log::error!("`am-i-mullvad` does not appear to have been split correctly.");
@@ -43,7 +43,7 @@ pub async fn test_split_tunnel(
 
     helpers::disconnect_and_wait(&mut mullvad_client).await?;
 
-    let i_am_mullvad_while_disconnected = parse_am_i_mullvad(rpc.exec("am-i-mullvad", []).await?);
+    let i_am_mullvad_while_disconnected = parse_am_i_mullvad(rpc.exec("am-i-mullvad", []).await?)?;
     if i_am_mullvad_while_disconnected {
         log::error!("We should be disconnected, but `am-i-mullvad` reported that it was connected to Mullvad.");
         log::error!("Host machine is probably connected to Mullvad. This may affect test results.");
@@ -51,7 +51,7 @@ pub async fn test_split_tunnel(
     }
 
     if errored {
-        panic!("test_split_tunnel failed, see logs for details.");
+        anyhow::bail!("test_split_tunnel failed, see log output for details.");
     }
 
     Ok(())
diff --git a/test/test-manager/test_macro/src/lib.rs b/test/test-manager/test_macro/src/lib.rs
index d95c3f8832..387676d80a 100644
--- a/test/test-manager/test_macro/src/lib.rs
+++ b/test/test-manager/test_macro/src/lib.rs
@@ -52,7 +52,7 @@ use syn::{AttributeArgs, Lit, Meta, NestedMeta};
 /// pub async fn test_function(
 ///     rpc: ServiceClient,
 ///     mut mullvad_client: mullvad_management_interface::MullvadProxyClient,
-/// ) -> Result<(), Error> {
+/// ) -> anyhow::Result<()> {
 ///     Ok(())
 /// }
 /// ```
@@ -67,7 +67,7 @@ use syn::{AttributeArgs, Lit, Meta, NestedMeta};
 /// pub async fn test_function(
 ///     rpc: ServiceClient,
 ///     mut mullvad_client: mullvad_management_interface::MullvadProxyClient,
-/// ) -> Result<(), Error> {
+/// ) -> anyhow::Result<()> {
 ///     Ok(())
 /// }
 /// ```
@@ -193,7 +193,7 @@ fn create_test(test_function: TestFunction) -> proc_macro2::TokenStream {
                     use std::any::Any;
                     let mullvad_client = mullvad_client.downcast::<#mullvad_client_type>().expect("invalid mullvad client");
                     Box::pin(async move {
-                        #func_name(test_context, rpc, *mullvad_client).await
+                        Ok(#func_name(test_context, rpc, *mullvad_client).await?)
                     })
                 }
             }
@@ -204,7 +204,7 @@ fn create_test(test_function: TestFunction) -> proc_macro2::TokenStream {
                 rpc: test_rpc::ServiceClient,
                 mullvad_client: Box<dyn std::any::Any + Send>| {
                     Box::pin(async move {
-                        #func_name(test_context, rpc).await
+                        Ok(#func_name(test_context, rpc).await?)
                     })
                 }
             }