Merge branch 'main' into factors

Signed-off-by: Lann Martin <lann.martin@fermyon.com>
fermyon · Jul 22, 2024 · fe1469e · fe1469e
2 parents 7c6faed + 67f189f
commit fe1469e
Show file tree

Hide file tree

Showing 42 changed files with 402 additions and 918 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -99,7 +99,9 @@ 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 = "main" }
+test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "d2129a3fd73140a76c77f15a030a5273b37cbd11" }
+conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev = "d2129a3fd73140a76c77f15a030a5273b37cbd11" }
+conformance = { path = "tests/conformance-tests" }
 
 [build-dependencies]
 cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "482f269eceb7b1a7e8fc618bf8c082dd24979cf1" }
@@ -134,7 +136,9 @@ hyper = { version = "1.0.0", features = ["full"] }
 reqwest = { version = "0.12", features = ["stream", "blocking"] }
 tracing = { version = "0.1", features = ["log"] }
 
-wasi-common-preview1 = { version = "22.0.0", package = "wasi-common", features = ["tokio"] }
+wasi-common-preview1 = { version = "22.0.0", package = "wasi-common", features = [
+  "tokio",
+] }
 wasmtime = "22.0.0"
 wasmtime-wasi = "22.0.0"
 wasmtime-wasi-http = "22.0.0"

diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml
@@ -19,7 +19,6 @@ spin-app = { path = "../app", optional = true }
 spin-locked-app = { path = "../locked-app" }
 
 [dev-dependencies]
-spin-testing = { path = "../testing" }
 toml = "0.8.2"
 
 [features]