Changes needed for TCP tests

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

Cargo.lock

@@ -99,7 +99,7 @@ redis = "0.24"
 runtime-tests = { path = "tests/runtime-tests" }
 test-components = { path = "tests/test-components" }
 test-codegen-macro = { path = "crates/test-codegen-macro" }
-test-environment = { git = "https://github.com/fermyon/conformance-tests", branch = "libtest_mimic" }
+test-environment = { git = "https://github.com/fermyon/conformance-tests", branch = "main" }
 
 [build-dependencies]
 cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "482f269eceb7b1a7e8fc618bf8c082dd24979cf1" }

Cargo.toml

@@ -11,8 +11,8 @@ rust-version.workspace = true
 [dependencies]
 anyhow = "1.0"
 testing-framework = { path = "../testing-framework" }
-conformance-tests = { git = "https://github.com/fermyon/conformance-tests", branch = "libtest_mimic" }
-test-environment = { git = "https://github.com/fermyon/conformance-tests", branch = "libtest_mimic" }
+conformance-tests = { git = "https://github.com/fermyon/conformance-tests", branch = "main" }
+test-environment = { git = "https://github.com/fermyon/conformance-tests", branch = "main" }
 
 [lints]
 workspace = true

tests/conformance-tests/Cargo.toml

@@ -1,3 +1,4 @@
+use anyhow::Context as _;
 use testing_framework::runtimes::spin_cli::{SpinCli, SpinConfig};
 
 fn main() {
@@ -15,6 +16,9 @@ fn run_test(test: conformance_tests::Test, spin_binary: &std::path::Path) -> any
             conformance_tests::config::Precondition::HttpEcho => {
                 services.push("http-echo".into());
             }
+            conformance_tests::config::Precondition::TcpEcho => {
+                services.push("tcp-echo".into());
+            }
             conformance_tests::config::Precondition::KeyValueStore(_) => {}
         }
     }
@@ -42,7 +46,15 @@ fn run_test(test: conformance_tests::Test, spin_binary: &std::path::Path) -> any
         let actual = invocation
             .request
             .send(|request| spin.make_http_request(request))?;
-        conformance_tests::assertions::assert_response(&invocation.response, &actual)?;
+
+        conformance_tests::assertions::assert_response(&invocation.response, &actual)
+            .with_context(|| {
+                format!(
+                    "Failed assertion.\nstdout: {}\nstderr: {}",
+                    spin.stdout().to_owned(),
+                    spin.stderr()
+                )
+            })?;
     }
     Ok(())
 }

tests/conformance-tests/src/main.rs

@@ -13,5 +13,5 @@ anyhow = "1.0"
 env_logger = "0.10.0"
 log = "0.4"
 testing-framework = { path = "../testing-framework" }
-test-environment = { git = "https://github.com/fermyon/conformance-tests", branch = "libtest_mimic" }
+test-environment = { git = "https://github.com/fermyon/conformance-tests", branch = "main" }
 test-components = { path = "../test-components" }

tests/runtime-tests/Cargo.toml

@@ -13,7 +13,7 @@ nix = "0.26.1"
 regex = "1.10.2"
 reqwest = { workspace = true }
 temp-dir = "0.1.11"
-test-environment = { git = "https://github.com/fermyon/conformance-tests", branch = "libtest_mimic" }
+test-environment = { git = "https://github.com/fermyon/conformance-tests", branch = "main" }
 spin-trigger-http = { path = "../../crates/trigger-http" }
 spin-http = { path = "../../crates/http" }
 spin-trigger = { path = "../../crates/trigger" }