Merge pull request #2764 from lann/fix-more-factors-tests

Fix more factors tests

Author: lann

Cargo.lock

@@ -10,14 +10,14 @@ http = "1.1.0"
 http-body-util = "0.1"
 hyper = "1.4.1"
 reqwest = { version = "0.11", features = ["gzip"] }
-rustls = "0.23"
+rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
 spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
 spin-factors = { path = "../factors" }
 spin-telemetry = { path = "../telemetry" }
 spin-world = { path = "../world" }
 terminal = { path = "../terminal" }
 tokio = { version = "1", features = ["macros", "rt"] }
-tokio-rustls = "0.26"
+tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12"] }
 tracing = { workspace = true }
 wasmtime = { workspace = true }
 wasmtime-wasi = { workspace = true }

crates/factor-outbound-http/Cargo.toml

@@ -9,7 +9,7 @@ anyhow = "1"
 futures-util = "0.3"
 http = "1.1.0"
 ipnet = "2.9.0"
-rustls = "0.23"
+rustls = { version = "0.23", default-features = false, features = ["ring", "std", "tls12"] }
 rustls-pemfile = { version = "2.1.2", optional = true }
 rustls-pki-types = "1.7.0"
 serde = { version = "1", features = ["derive"] }

crates/factor-outbound-networking/Cargo.toml

@@ -173,8 +173,7 @@ impl<'a> TomlResolver<'a> {
         // Prefer explicitly provided state directory, then take from toml.
         self.state_dir
             .or_else(from_toml)
-            .map(PathBuf::from)
-            .map(std::fs::canonicalize)
+            .map(std::path::absolute)
             .transpose()
     }
 

crates/runtime-config/src/lib.rs

@@ -73,7 +73,10 @@ async fn _main() -> anyhow::Result<()> {
         }
     }
 
-    SpinApp::from_arg_matches(&matches)?.run(cmd).await
+    SpinApp::from_arg_matches(&matches)?
+        .run(cmd)
+        .await
+        .inspect_err(|err| tracing::debug!(?err))
 }
 
 fn print_error_chain(err: anyhow::Error) {

examples/spin-timer/Cargo.lock

@@ -341,8 +341,13 @@ mod integration_tests {
                 app_type: SpinAppType::None,
             },
             ServicesConfig::none(),
-            |_| Ok(()),
+            |env| {
+                // Since this test asserts exact stderr output, disable logging
+                env.set_env_var("RUST_LOG", "off");
+                Ok(())
+            },
         )?;
+
         let expected = r#"Error: Couldn't find trigger executor for local app "spin.toml"
 
 Caused by: