Merge pull request #2668 from itowlson/break-circular-dependency-spin…

…-http-spin-testing Break circular dependency between `http` and `testing` crates
fermyon · Jul 22, 2024 · ee6a267 · ee6a267
2 parents 286cf43 + 1c8fb60
commit ee6a267
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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 = "main" }
+test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "2bb3eb83467a9e9595fa0fd11d7a49fa0300b113" }
 
 [build-dependencies]
 cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "482f269eceb7b1a7e8fc618bf8c082dd24979cf1" }

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]

diff --git a/tests/conformance-tests/Cargo.toml b/tests/conformance-tests/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 = "main" }
-test-environment = { git = "https://github.com/fermyon/conformance-tests", branch = "main" }
+conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev = "2bb3eb83467a9e9595fa0fd11d7a49fa0300b113" }
+test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "2bb3eb83467a9e9595fa0fd11d7a49fa0300b113" }
 
 [lints]
 workspace = true
diff --git a/tests/runtime-tests/Cargo.toml b/tests/runtime-tests/Cargo.toml
@@ -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 = "main" }
+test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "2bb3eb83467a9e9595fa0fd11d7a49fa0300b113" }
 test-components = { path = "../test-components" }
diff --git a/tests/testing-framework/Cargo.toml b/tests/testing-framework/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 = "main" }
+test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "2bb3eb83467a9e9595fa0fd11d7a49fa0300b113" }
 spin-trigger-http = { path = "../../crates/trigger-http" }
 spin-http = { path = "../../crates/http" }
 spin-trigger = { path = "../../crates/trigger" }