Merge branch 'upgrade-inventory-to-sound-version-without-cves-des-570'

4 files changed, 16 insertions, 52 deletions

diff --git a/test/Cargo.lock b/test/Cargo.lock
index 2579a6a005..b974ef9217 100644
--- a/test/Cargo.lock
+++ b/test/Cargo.lock
@@ -570,16 +570,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
 name = "ctr"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1031,17 +1021,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "ghost"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba330b70a5341d3bc730b8e205aaee97ddab5d9c448c4f51a7c2d924266fa8f9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.51",
-]
-
-[[package]]
 name = "gimli"
 version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1326,25 +1305,9 @@ dependencies = [
 
 [[package]]
 name = "inventory"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb5160c60ba1e809707918ee329adb99d222888155835c6feedba19f6c3fd4"
-dependencies = [
- "ctor",
- "ghost",
- "inventory-impl",
-]
-
-[[package]]
-name = "inventory-impl"
-version = "0.1.11"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e41b53715c6f0c4be49510bb82dee2c1e51c8586d885abe65396e82ed518548"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
+checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
 
 [[package]]
 name = "io-kit-sys"
diff --git a/test/test-manager/Cargo.toml b/test/test-manager/Cargo.toml
index f0e6cb9235..37cfbc5a85 100644
--- a/test/test-manager/Cargo.toml
+++ b/test/test-manager/Cargo.toml
@@ -23,7 +23,7 @@ bytes = { workspace = true }
 test_macro = { path = "./test_macro" }
 ipnetwork = "0.20"
 once_cell = { workspace = true }
-inventory = "0.1"
+inventory = "0.3"
 data-encoding-macro = "0.1.12"
 itertools = "0.10.5"
 libc = "0.2.14"
diff --git a/test/test-manager/src/tests/mod.rs b/test/test-manager/src/tests/mod.rs
index b104dbe9e8..0cf1357696 100644
--- a/test/test-manager/src/tests/mod.rs
+++ b/test/test-manager/src/tests/mod.rs
@@ -28,13 +28,11 @@ pub struct TestContext {
     pub rpc_provider: RpcClientProvider,
 }
 
-pub type TestWrapperFunction = Box<
-    dyn Fn(
-        TestContext,
-        ServiceClient,
-        Box<dyn std::any::Any + Send>,
-    ) -> BoxFuture<'static, Result<(), Error>>,
->;
+pub type TestWrapperFunction = fn(
+    TestContext,
+    ServiceClient,
+    Box<dyn std::any::Any + Send>,
+) -> BoxFuture<'static, Result<(), Error>>;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
diff --git a/test/test-manager/test_macro/src/lib.rs b/test/test-manager/test_macro/src/lib.rs
index 0f854e953b..d95c3f8832 100644
--- a/test/test-manager/test_macro/src/lib.rs
+++ b/test/test-manager/test_macro/src/lib.rs
@@ -162,11 +162,14 @@ fn create_test(test_function: TestFunction) -> proc_macro2::TokenStream {
         Some(priority) => quote! { Some(#priority) },
         None => quote! { None },
     };
-    let target_os = match test_function.macro_parameters.target_os {
+    let target_os = match test_function.macro_parameters.target_os.as_deref() {
+        Some("linux") => quote! { Some(::test_rpc::meta::Os::Linux) },
+        Some("macos") => quote! { Some(::test_rpc::meta::Os::Macos) },
+        Some("windows") => quote! { Some(::test_rpc::meta::Os::Windows) },
         Some(target_os) => {
-            quote! {
-                Some(::std::str::FromStr::from_str(#target_os).expect("invalid target os"))
-            }
+            return quote! {
+                compile_error!("invalid target_os: {:?}", #target_os);
+            };
         }
         None => quote! { None },
     };
@@ -214,7 +217,7 @@ fn create_test(test_function: TestFunction) -> proc_macro2::TokenStream {
             command: stringify!(#func_name),
             target_os: #target_os,
             mullvad_client_version: #function_mullvad_version,
-            func: Box::new(#wrapper_closure),
+            func: #wrapper_closure,
             priority: #test_function_priority,
             always_run: #always_run,
             must_succeed: #must_succeed,